ooo-build r13286 - in trunk: . patches/dev300
- From: strba svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13286 - in trunk: . patches/dev300
- Date: Fri, 18 Jul 2008 08:49:06 +0000 (UTC)
Author: strba
Date: Fri Jul 18 08:49:06 2008
New Revision: 13286
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13286&view=rev
Log:
adapt to recent CVS HEAD of libwpg and handle rotated ellipses in WPG files
Modified:
trunk/ChangeLog
trunk/patches/dev300/writerperfect-testing.diff
Modified: trunk/patches/dev300/writerperfect-testing.diff
==============================================================================
--- trunk/patches/dev300/writerperfect-testing.diff (original)
+++ trunk/patches/dev300/writerperfect-testing.diff Fri Jul 18 08:49:06 2008
@@ -1,5 +1,5 @@
---- writerperfect//source/filter/DocumentCollector.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/DocumentCollector.cxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/DocumentCollector.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/DocumentCollector.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -39,6 +39,8 @@
#include "DocumentCollector.hxx"
@@ -1524,8 +1524,8 @@
+ mpCurrentContentElements->push_back(new TagCloseElement("draw:text-box"));
+}
+
---- writerperfect//source/filter/DocumentCollector.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/DocumentCollector.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/DocumentCollector.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/DocumentCollector.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -45,8 +45,9 @@
#include <stack>
#include <string.h>
@@ -1697,8 +1697,8 @@
};
#endif
---- writerperfect//source/filter/DocumentElement.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/DocumentElement.cxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/DocumentElement.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/DocumentElement.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -26,6 +26,7 @@
*/
@@ -1745,8 +1745,8 @@
WPXPropertyList xBlankAttrList;
WPXString sTemp;
---- writerperfect//source/filter/DocumentElement.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/DocumentElement.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/DocumentElement.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/DocumentElement.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -21,36 +21,31 @@
*
*/
@@ -1834,8 +1834,8 @@
-
+
#endif
---- writerperfect//source/filter/DocumentHandler.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/DocumentHandler.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/DocumentHandler.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/DocumentHandler.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -11,10 +11,12 @@
#pragma warning( pop )
#endif
@@ -1850,8 +1850,8 @@
{
public:
DocumentHandler(Reference < XDocumentHandler > &xHandler);
---- writerperfect//source/filter/DocumentHandlerInterface.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/DocumentHandlerInterface.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/DocumentHandlerInterface.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/DocumentHandlerInterface.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2004 William Lachance (wlach interlog com)
@@ -1898,8 +1898,8 @@
+ virtual void characters(const WPXString &sCharacters) = 0;
+};
+#endif
---- writerperfect//source/filter/FontStyle.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/FontStyle.cxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/FontStyle.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/FontStyle.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -29,7 +29,7 @@
#include "DocumentElement.hxx"
@@ -1928,8 +1928,8 @@
+ TagCloseElement styleClose("style:font-face");
styleClose.write(pHandler);
}
---- writerperfect//source/filter/FontStyle.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/FontStyle.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/FontStyle.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/FontStyle.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -21,28 +21,23 @@
*
*/
@@ -1962,8 +1962,8 @@
const WPXString &getFontFamily() const { return msFontFamily; }
private:
---- writerperfect//source/filter/GraphicsStyle.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/GraphicsStyle.cxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/GraphicsStyle.cxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/GraphicsStyle.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -0,0 +1,40 @@
+/* GraphicsStyle:
+ *
@@ -2005,8 +2005,8 @@
+void GraphicsStyle::write(DocumentHandlerInterface * /* pHandler */) const
+{
+}
---- writerperfect//source/filter/GraphicsStyle.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/GraphicsStyle.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/GraphicsStyle.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/GraphicsStyle.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -0,0 +1,40 @@
+/* GraphicsStyle:
+ *
@@ -2048,8 +2048,8 @@
+ virtual void write(DocumentHandlerInterface *pHandler) const;
+};
+#endif
---- writerperfect//source/filter/InternalHandler.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/InternalHandler.cxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/InternalHandler.cxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/InternalHandler.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2007 Fridrich Strba strba bluewin ch)
@@ -2105,8 +2105,8 @@
+{
+ mpElements->push_back(new CharDataElement(sCharacters.cstr()));
+}
---- writerperfect//source/filter/InternalHandler.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/InternalHandler.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/InternalHandler.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/InternalHandler.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2007 Fridrich Strba strba bluewin ch)
@@ -2154,8 +2154,8 @@
+ std::vector<DocumentElement *> *mpElements;
+};
+#endif
---- writerperfect//source/filter/ListStyle.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/ListStyle.cxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/ListStyle.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/ListStyle.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -29,7 +29,7 @@
#include "DocumentElement.hxx"
@@ -2285,8 +2285,8 @@
{
TagOpenElement listStyleOpenElement("text:list-style");
listStyleOpenElement.addAttribute("style:name", getName());
---- writerperfect//source/filter/ListStyle.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/ListStyle.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/ListStyle.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/ListStyle.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -21,23 +21,18 @@
*
*/
@@ -2348,8 +2348,8 @@
const int getListID() { return miListID; }
const bool isListLevelDefined(int iLevel) const;
---- writerperfect//source/filter/makefile.mk 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/makefile.mk 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/makefile.mk 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/makefile.mk 2008-07-18 10:30:09.000000000 +0200
@@ -10,6 +10,10 @@
INCPRE+=$(LIBWPD_CFLAGS)
.ENDIF
@@ -2388,9 +2388,9 @@
+ $(SLO)$/TextRunStyle.obj
.INCLUDE : target.mk
---- writerperfect//source/filter/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/OdgExporter.cxx 2008-06-25 22:56:11.000000000 +0200
-@@ -0,0 +1,615 @@
+--- writerperfect/source/filter/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/OdgExporter.cxx 2008-07-18 10:38:52.000000000 +0200
+@@ -0,0 +1,647 @@
+/* libwpg
+ * Copyright (C) 2006 Ariya Hidayat (ariya kde org)
+ * Copyright (C) 2006 Fridrich Strba strba bluewin ch)
@@ -2421,8 +2421,13 @@
+#include "DocumentElement.hxx"
+#include "DocumentHandlerInterface.hxx"
+#include <locale.h>
++#include <math.h>
+#include <string>
+
++#ifndef M_PI
++#define M_PI 3.14159265358979323846
++#endif
++
+OdgExporter::OdgExporter(DocumentHandlerInterface *pHandler, const bool isFlatXML):
+ mpHandler(pHandler),
+ mxFillRule(AlternatingFill),
@@ -2661,9 +2666,9 @@
+ pDrawRectElement->addAttribute("svg:x", sValue);
+ sValue = doubleToString(rect.y1); sValue.append("in");
+ pDrawRectElement->addAttribute("svg:y", sValue);
-+ sValue = doubleToString(rect.x2-rect.x1); sValue.append("in");
++ sValue = doubleToString(rect.width()); sValue.append("in");
+ pDrawRectElement->addAttribute("svg:width", sValue);
-+ sValue = doubleToString(rect.y2-rect.y1); sValue.append("in");
++ sValue = doubleToString(rect.height()); sValue.append("in");
+ pDrawRectElement->addAttribute("svg:height", sValue);
+ sValue = doubleToString(rx); sValue.append("in");
+ // FIXME: what to do when rx != ry ?
@@ -2672,27 +2677,53 @@
+ mBodyElements.push_back(new TagCloseElement("draw:rect"));
+}
+
-+void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
++void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry, double rotation, const libwpg::WPGPoint& from, const libwpg::WPGPoint& to)
+{
+ writeGraphicsStyle();
+ TagOpenElement *pDrawEllipseElement = new TagOpenElement("draw:ellipse");
+ WPXString sValue;
+ sValue.sprintf("gr%i", miGraphicsStyleIndex-1);
+ pDrawEllipseElement->addAttribute("draw:style-name", sValue);
-+ sValue = doubleToString(center.x-rx); sValue.append("in");
-+ pDrawEllipseElement->addAttribute("svg:x", sValue);
-+ sValue = doubleToString(center.y-ry); sValue.append("in");
-+ pDrawEllipseElement->addAttribute("svg:y", sValue);
+ sValue = doubleToString(2 * rx); sValue.append("in");
+ pDrawEllipseElement->addAttribute("svg:width", sValue);
+ sValue = doubleToString(2 * ry); sValue.append("in");
+ pDrawEllipseElement->addAttribute("svg:height", sValue);
++ if (rotation != 0.0)
++ {
++ while(rotation < -180)
++ rotation += 360;
++ while(rotation > 180)
++ rotation -= 360;
++ double radrotation = rotation*M_PI/180.0;
++ double deltax = sqrt(pow(rx, 2.0) + pow(ry, 2.0))*cos(atan(ry/rx) - radrotation ) - rx;
++ double deltay = sqrt(pow(rx, 2.0) + pow(ry, 2.0))*sin(atan(ry/rx) - radrotation ) - ry;
++ sValue = "rotate("; sValue.append(doubleToString(radrotation)); sValue.append(") ");
++ sValue.append("translate("); sValue.append(doubleToString(center.x - rx - deltax)); sValue.append("in, "); sValue.append(doubleToString(center.y - ry - deltay)); sValue.append("in)");
++ pDrawEllipseElement->addAttribute("svg:transform", sValue);
++ }
++ else
++ {
++ sValue = doubleToString(center.x-rx); sValue.append("in");
++ pDrawEllipseElement->addAttribute("svg:x", sValue);
++ sValue = doubleToString(center.y-ry); sValue.append("in");
++ pDrawEllipseElement->addAttribute("svg:y", sValue);
++ }
+ mBodyElements.push_back(pDrawEllipseElement);
+ mBodyElements.push_back(new TagCloseElement("draw:ellipse"));
+}
+
++void OdgExporter::drawPolyline(const libwpg::WPGPointArray& vertices)
++{
++ drawPolySomething(vertices, false);
++}
++
+void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
+{
++ drawPolySomething(vertices, true);
++}
++
++void OdgExporter::drawPolySomething(const libwpg::WPGPointArray& vertices, bool isClosed)
++{
+ if(vertices.count() < 2)
+ return;
+
@@ -2726,7 +2757,7 @@
+ path.moveTo(vertices[0]);
+ for(unsigned long ii = 1; ii < vertices.count(); ii++)
+ path.lineTo(vertices[ii]);
-+ path.closed = true;
++ path.closed = isClosed;
+ drawPath(path);
+ }
+}
@@ -2951,6 +2982,7 @@
+ {
+ sValue = doubleToString(mxPen.width); sValue.append("in");
+ pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-width", sValue);
++
+ sValue.sprintf("#%.2x%.2x%.2x", (mxPen.foreColor.red & 0xff),
+ (mxPen.foreColor.green & 0xff), (mxPen.foreColor.blue & 0xff));
+ pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-color", sValue);
@@ -3006,9 +3038,9 @@
+ }
+ return WPXString(stringValue.c_str());
+}
---- writerperfect//source/filter/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/OdgExporter.hxx 2008-06-25 22:56:11.000000000 +0200
-@@ -0,0 +1,85 @@
+--- writerperfect/source/filter/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/OdgExporter.hxx 2008-07-18 10:38:52.000000000 +0200
+@@ -0,0 +1,89 @@
+/* libwpg
+ * Copyright (C) 2006 Ariya Hidayat (ariya kde org)
+ *
@@ -3055,13 +3087,16 @@
+ void endGraphics();
+ void startLayer(unsigned int id);
+ void endLayer(unsigned int id);
++ void startEmbeddedGraphics( double /* width */, double /* height */ ) {}
++ void endEmbeddedGraphics() {}
+
+ void setPen(const libwpg::WPGPen& pen);
+ void setBrush(const libwpg::WPGBrush& brush);
+ void setFillRule(FillRule rule);
+
+ void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
-+ void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
++ void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry, double rotation, const libwpg::WPGPoint& from, const libwpg::WPGPoint& to);
++ void drawPolyline(const libwpg::WPGPointArray& vertices);
+ void drawPolygon(const libwpg::WPGPointArray& vertices);
+ void drawPath(const libwpg::WPGPath& path);
+ void drawBitmap(const libwpg::WPGBitmap& bitmap);
@@ -3070,6 +3105,7 @@
+private:
+ void writeGraphicsStyle();
+ WPXString doubleToString(const double value);
++ void drawPolySomething(const libwpg::WPGPointArray& vertices, bool isClosed);
+
+ // body elements
+ std::vector <DocumentElement *> mBodyElements;
@@ -3094,8 +3130,8 @@
+};
+
+#endif // __ODGEXPORTER_HXX__
---- writerperfect//source/filter/PageSpan.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/PageSpan.cxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/PageSpan.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/PageSpan.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -87,39 +87,38 @@
return 0; // should never happen
}
@@ -3235,8 +3271,8 @@
- headerFooterClose.write(pHandler);
}
-
---- writerperfect//source/filter/PageSpan.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/PageSpan.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/PageSpan.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/PageSpan.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -26,25 +26,20 @@
*/
#ifndef _PAGESPAN_H
@@ -3276,8 +3312,8 @@
private:
WPXPropertyList mxPropList;
std::vector<DocumentElement *> * mpHeaderContent;
---- writerperfect//source/filter/SectionStyle.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/SectionStyle.cxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/SectionStyle.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/SectionStyle.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -33,7 +33,7 @@
#ifdef _MSC_VER
@@ -3324,8 +3360,8 @@
pHandler->endElement("style:style");
}
---- writerperfect//source/filter/SectionStyle.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/SectionStyle.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/SectionStyle.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/SectionStyle.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -21,19 +21,13 @@
*
*/
@@ -3360,8 +3396,8 @@
WPXPropertyListVector mColumns;
};
#endif
---- writerperfect//source/filter/Style.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/Style.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/Style.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/Style.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -21,19 +21,13 @@
*
*/
@@ -3392,8 +3428,8 @@
const WPXString &getName() const { return msName; }
private:
---- writerperfect//source/filter/TableStyle.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/TableStyle.cxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/TableStyle.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/TableStyle.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -27,7 +27,6 @@
* Corel Corporation or Corel Corporation Limited."
*/
@@ -3510,8 +3546,8 @@
pHandler->endElement("style:style");
---- writerperfect//source/filter/TableStyle.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/TableStyle.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/TableStyle.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/TableStyle.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -22,57 +22,53 @@
*
*/
@@ -3582,8 +3618,8 @@
WPXPropertyListVector mColumns;
std::vector<TableCellStyle *> mTableCellStyles;
std::vector<TableRowStyle *> mTableRowStyles;
---- writerperfect//source/filter/TextRunStyle.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/TextRunStyle.cxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/TextRunStyle.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/TextRunStyle.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -50,91 +50,95 @@
delete mpPropList;
}
@@ -3761,8 +3797,8 @@
+ pHandler->endElement("style:text-properties");
pHandler->endElement("style:style");
}
---- writerperfect//source/filter/TextRunStyle.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/TextRunStyle.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/TextRunStyle.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/TextRunStyle.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -29,26 +29,19 @@
#ifndef _TEXTRUNSTYLE_H
@@ -3800,16 +3836,16 @@
private:
WPXPropertyList mPropList;
---- writerperfect//source/filter/WriterProperties.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/filter/WriterProperties.hxx 2008-06-25 22:56:11.000000000 +0200
+--- writerperfect/source/filter/WriterProperties.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/filter/WriterProperties.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -32,5 +32,4 @@
#define IMP_DEFAULT_FONT_NAME "Times New Roman"
#define IMP_DEFAULT_FONT_SIZE 12.0f
#define IMP_DEFAULT_FONT_PITCH "variable"
-#define IMP_DEFAULT_FONT_COLOR (new RGBSColor(0x00,0x00,0x00,0x64))
#endif
---- writerperfect//source/stream/WPXSvStream.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/stream/WPXSvStream.cxx 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/stream/WPXSvStream.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/stream/WPXSvStream.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -9,7 +9,7 @@
using namespace ::com::sun::star::io;
@@ -3846,8 +3882,8 @@
-{
- return getDocumentOLEStream( "PerfectOffice_MAIN" );
-}
---- writerperfect//source/stream/WPXSvStream.h 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/stream/WPXSvStream.h 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/stream/WPXSvStream.h 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/stream/WPXSvStream.h 2008-07-18 10:30:09.000000000 +0200
@@ -12,13 +12,12 @@
#if defined _MSC_VER
#pragma warning( push, 1 )
@@ -3876,8 +3912,8 @@
virtual int seek(long offset, WPX_SEEK_TYPE seekType);
virtual long tell();
virtual bool atEOS();
---- writerperfect//source/wpdimp/makefile.mk 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpdimp/makefile.mk 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/wpdimp/makefile.mk 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpdimp/makefile.mk 2008-07-18 10:30:09.000000000 +0200
@@ -10,6 +10,10 @@
INCPRE+=$(LIBWPD_CFLAGS)
.ENDIF
@@ -3889,8 +3925,8 @@
.IF "$(SYSTEM_LIBWPS)" == "YES"
INCPRE+=$(LIBWPS_CFLAGS)
.ENDIF
---- writerperfect//source/wpdimp/WordPerfectCollector.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpdimp/WordPerfectCollector.cxx 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/wpdimp/WordPerfectCollector.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpdimp/WordPerfectCollector.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -35,8 +35,9 @@
#pragma warning( pop )
#endif
@@ -3919,8 +3955,8 @@
if (result != WPD_OK)
return false;
---- writerperfect//source/wpdimp/WordPerfectCollector.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpdimp/WordPerfectCollector.hxx 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/wpdimp/WordPerfectCollector.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpdimp/WordPerfectCollector.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -30,12 +30,16 @@
#define _WORDPERFECTCOLLECTOR_HXX
@@ -3940,8 +3976,8 @@
+ rtl::OString maUtf8Password;
};
#endif
---- writerperfect//source/wpdimp/WordPerfectImportFilter.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpdimp/WordPerfectImportFilter.cxx 2008-06-25 23:23:13.000000000 +0200
+--- writerperfect/source/wpdimp/WordPerfectImportFilter.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpdimp/WordPerfectImportFilter.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -29,27 +29,19 @@
*/
@@ -4192,8 +4228,8 @@
+{
+ return (cppu::OWeakObject*) new WordPerfectImportFilterDialog( rSMgr );
+}
---- writerperfect//source/wpdimp/WordPerfectImportFilter.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpdimp/WordPerfectImportFilter.hxx 2008-06-25 23:21:42.000000000 +0200
+--- writerperfect/source/wpdimp/WordPerfectImportFilter.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpdimp/WordPerfectImportFilter.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -32,9 +32,13 @@
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XImporter.hpp>
@@ -4269,8 +4305,8 @@
+ throw ( ::com::sun::star::uno::Exception );
+
#endif
---- writerperfect//source/wpdimp/wpft_genericfilter.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpdimp/wpft_genericfilter.cxx 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/wpdimp/wpft_genericfilter.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpdimp/wpft_genericfilter.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -55,14 +55,22 @@
{
sal_Int32 nPos = 0;
@@ -4328,8 +4364,8 @@
return pRet;
}
}
---- writerperfect//source/wpgimp/makefile.mk 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpgimp/makefile.mk 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/wpgimp/makefile.mk 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpgimp/makefile.mk 2008-07-18 10:30:09.000000000 +0200
@@ -12,12 +12,6 @@
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
.ENDIF
@@ -4351,8 +4387,8 @@
$(SLO)$/WPGImportFilter.obj \
$(SLO)$/wpgimport_genericfilter.obj
---- writerperfect//source/wpgimp/WPGImportFilter.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpgimp/WPGImportFilter.cxx 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/wpgimp/WPGImportFilter.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpgimp/WPGImportFilter.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -75,7 +75,7 @@
#endif
@@ -4396,8 +4432,8 @@
if (libwpg::WPGraphics::isSupported(input))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_WordPerfect_Graphics" ) );
---- writerperfect//source/wpsimp/MSWorksCollector.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpsimp/MSWorksCollector.cxx 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/wpsimp/MSWorksCollector.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpsimp/MSWorksCollector.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -29,7 +29,7 @@
#include "MSWorksCollector.hxx"
#include <libwps/WPSDocument.h>
@@ -4419,8 +4455,8 @@
if (result != WPS_OK)
return false;
---- writerperfect//source/wpsimp/MSWorksCollector.hxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpsimp/MSWorksCollector.hxx 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/wpsimp/MSWorksCollector.hxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpsimp/MSWorksCollector.hxx 2008-07-18 10:30:09.000000000 +0200
@@ -30,12 +30,13 @@
#define _MSWORKSCOLLECTOR_HXX
@@ -4437,8 +4473,8 @@
+ bool parseSourceDocument(WPXInputStream &input);
};
#endif
---- writerperfect//source/wpsimp/MSWorksImportFilter.cxx 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//source/wpsimp/MSWorksImportFilter.cxx 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/source/wpsimp/MSWorksImportFilter.cxx 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/source/wpsimp/MSWorksImportFilter.cxx 2008-07-18 10:30:09.000000000 +0200
@@ -127,7 +127,7 @@
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
@@ -4457,8 +4493,8 @@
if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence == WPS_CONFIDENCE_GOOD))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_MS_Works_Document" ) );
---- writerperfect//util/makefile.mk 2008-06-25 22:55:53.000000000 +0200
-+++ writerperfect//util/makefile.mk 2008-06-25 22:56:12.000000000 +0200
+--- writerperfect/util/makefile.mk 2008-07-18 10:29:16.000000000 +0200
++++ writerperfect/util/makefile.mk 2008-07-18 10:30:09.000000000 +0200
@@ -44,6 +44,8 @@
$(SOTLIB) \
$(SO2LIB) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
