[ooo-build-commit] patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Fri Nov 27 07:33:26 PST 2009
patches/dev300/apply | 24 --
patches/dev300/libwpd-testing.diff | 6
patches/dev300/writerperfect-testing.diff | 288 +++++++++++++++---------------
3 files changed, 156 insertions(+), 162 deletions(-)
New commits:
commit 7fd0985f42badd478153c8f17a66f02a5961e06b
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Fri Nov 27 16:11:54 2009 +0100
Massage patches for UnstableLibwp section to apply.
* patches/dev300/apply:
* patches/dev300/libwpd-testing.diff:
* patches/dev300/writerperfect-testing.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 97f4337..f7b118e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -32,7 +32,7 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
UnUsedButNotYetRemovedFromGit, WebDAVUpstream, \
PostgreSQL, SELinux, VOSremoval, Glib2, \
UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, \
- KDE4Experimental, MinGW, CalcExperimental, Mono24, \
+ KDE4Experimental, MinGW, CalcExperimental, \
OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
WriterNavigation, WriterDocComparison, SystemGraphiteWithSTLport, \
HPPA
@@ -135,7 +135,7 @@ Pardus2008: PardusOnly, LinuxCommon, NotDebian
# Solaris
Solaris: NovellBase, UnstableExtensions
# Universal Upstream-like packages
-GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, GoOoSplash, Mono24
+GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, GoOoSplash
# OxygenOffice Professional
OxygenOfficeLinuxCommon : Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
LinuxOnly, SystemBits, \
@@ -1682,12 +1682,6 @@ mono-climaker-config.diff
mono-climaker-bridgetest.diff
-[ Mono24 ]
-# WARNING: Use on your own risk ;-)
-# This just fixes the build with mono-2.4; I have no idea whether the mono bridge still works
-# you might want to apply the right fix into mono, see https://bugzilla.novell.com/show_bug.cgi?id=471379
-mono-2.4-workaround.diff, bnc#495112, pmladek
-
[ VBAObjects == dev300-m61 == ooo320-m1 ]
cws-vbasupportdev300-m1.diff
[ VBAObjects == dev300-m62 == ooo320-m2 ]
@@ -2901,13 +2895,6 @@ sc-autofilter-l10n-es.diff, i#103840, pmladek
# pack only selected languages in the l10n module
l10n-build-only-selected-langs.diff, i#106185, pmladek
-[ UnstableLibwpd ]
-config_office-testing.diff
-libwpd-testing.diff
-libwpg-testing.diff
-libwps-testing.diff
-writerperfect-testing.diff
-
[ PieceBits ]
# zipintro is not kind to us ...
piece-desktop.diff
@@ -3448,3 +3435,10 @@ oox-pptx-export-update-to-ooo320.diff, rodo
[ HPPA < dev300-m66 ]
cws-linuxhppa1.diff, i#107051
+
+[ UnstableLibwpd ]
+config_office-testing.diff
+libwpd-testing.diff
+libwpg-testing.diff
+libwps-testing.diff
+writerperfect-testing.diff
diff --git a/patches/dev300/libwpd-testing.diff b/patches/dev300/libwpd-testing.diff
index 130177c..0a79fe1 100644
--- a/patches/dev300/libwpd-testing.diff
+++ b/patches/dev300/libwpd-testing.diff
@@ -1,12 +1,12 @@
--- libwpd/makefile.mk 2008-04-07 14:04:18.000000000 +0200
+++ libwpd/makefile.mk 2008-04-07 14:05:05.000000000 +0200
-@@ -49,7 +49,7 @@
- @echo "Using system libwpd..."
+@@ -45,7 +45,7 @@
+ @echo "Using system libwpd..."
.ENDIF
-TARFILE_NAME=libwpd-0.8.14
+TARFILE_NAME=libwpd-0.9.0~CVS20081118
- #PATCH_FILE_NAME=$(TARFILE_NAME).diff
+ #PATCH_FILES=$(TARFILE_NAME).diff
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
--- libwpd/prj/d.lst 2008-04-07 14:04:18.000000000 +0200
diff --git a/patches/dev300/writerperfect-testing.diff b/patches/dev300/writerperfect-testing.diff
index 7ed1678..00c9ba4 100644
--- a/patches/dev300/writerperfect-testing.diff
+++ b/patches/dev300/writerperfect-testing.diff
@@ -1,15 +1,15 @@
-diff -u -r -N writerperfect//prj/build.lst writerperfect//prj/build.lst
---- writerperfect//prj/build.lst 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//prj/build.lst 2008-11-17 23:37:06.000000000 +0100
+diff -u -r -N writerperfect/prj/build.lst writerperfect/prj/build.lst
+--- writerperfect/prj/build.lst 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/prj/build.lst 2008-11-17 23:37:06.000000000 +0100
@@ -1,4 +1,4 @@
-wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff NULL
+wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff sfx2 NULL
wp writerperfect usr1 - all wp_mkout NULL
wp writerperfect\source\stream nmake - all wp_stream NULL
wp writerperfect\source\filter nmake - all wp_filter NULL
-diff -u -r -N writerperfect//source/filter/DocumentCollector.cxx writerperfect//source/filter/DocumentCollector.cxx
---- writerperfect//source/filter/DocumentCollector.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/DocumentCollector.cxx 2008-11-17 23:30:51.000000000 +0100
+diff -u -r -N writerperfect/source/filter/DocumentCollector.cxx writerperfect/source/filter/DocumentCollector.cxx
+--- writerperfect/source/filter/DocumentCollector.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/DocumentCollector.cxx 2008-11-17 23:30:51.000000000 +0100
@@ -39,6 +39,8 @@
#include "DocumentCollector.hxx"
@@ -1562,9 +1562,9 @@ diff -u -r -N writerperfect//source/filter/DocumentCollector.cxx writerperfect//
+ mpCurrentContentElements->push_back(new TagCloseElement("draw:text-box"));
+}
+
-diff -u -r -N writerperfect//source/filter/DocumentCollector.hxx writerperfect//source/filter/DocumentCollector.hxx
---- writerperfect//source/filter/DocumentCollector.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/DocumentCollector.hxx 2008-11-17 23:31:21.000000000 +0100
+diff -u -r -N writerperfect/source/filter/DocumentCollector.hxx writerperfect/source/filter/DocumentCollector.hxx
+--- writerperfect/source/filter/DocumentCollector.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/DocumentCollector.hxx 2008-11-17 23:31:21.000000000 +0100
@@ -45,8 +45,9 @@
#include <stack>
#include <string.h>
@@ -1736,9 +1736,9 @@ diff -u -r -N writerperfect//source/filter/DocumentCollector.hxx writerperfect//
};
#endif
-diff -u -r -N writerperfect//source/filter/DocumentElement.cxx writerperfect//source/filter/DocumentElement.cxx
---- writerperfect//source/filter/DocumentElement.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/DocumentElement.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/DocumentElement.cxx writerperfect/source/filter/DocumentElement.cxx
+--- writerperfect/source/filter/DocumentElement.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/DocumentElement.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -26,6 +26,7 @@
*/
@@ -1785,9 +1785,9 @@ diff -u -r -N writerperfect//source/filter/DocumentElement.cxx writerperfect//so
WPXPropertyList xBlankAttrList;
WPXString sTemp;
-diff -u -r -N writerperfect//source/filter/DocumentElement.hxx writerperfect//source/filter/DocumentElement.hxx
---- writerperfect//source/filter/DocumentElement.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/DocumentElement.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/DocumentElement.hxx writerperfect/source/filter/DocumentElement.hxx
+--- writerperfect/source/filter/DocumentElement.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/DocumentElement.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -21,36 +21,31 @@
*
*/
@@ -1875,9 +1875,9 @@ diff -u -r -N writerperfect//source/filter/DocumentElement.hxx writerperfect//so
-
+
#endif
-diff -u -r -N writerperfect//source/filter/DocumentHandler.hxx writerperfect//source/filter/DocumentHandler.hxx
---- writerperfect//source/filter/DocumentHandler.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/DocumentHandler.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/DocumentHandler.hxx writerperfect/source/filter/DocumentHandler.hxx
+--- writerperfect/source/filter/DocumentHandler.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/DocumentHandler.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -11,10 +11,12 @@
#pragma warning( pop )
#endif
@@ -1892,9 +1892,9 @@ diff -u -r -N writerperfect//source/filter/DocumentHandler.hxx writerperfect//so
{
public:
DocumentHandler(Reference < XDocumentHandler > &xHandler);
-diff -u -r -N writerperfect//source/filter/DocumentHandlerInterface.hxx writerperfect//source/filter/DocumentHandlerInterface.hxx
---- writerperfect//source/filter/DocumentHandlerInterface.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/DocumentHandlerInterface.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/DocumentHandlerInterface.hxx writerperfect/source/filter/DocumentHandlerInterface.hxx
+--- writerperfect/source/filter/DocumentHandlerInterface.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/DocumentHandlerInterface.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2004 William Lachance (wlach at interlog.com)
@@ -1941,9 +1941,9 @@ diff -u -r -N writerperfect//source/filter/DocumentHandlerInterface.hxx writerpe
+ virtual void characters(const WPXString &sCharacters) = 0;
+};
+#endif
-diff -u -r -N writerperfect//source/filter/FontStyle.cxx writerperfect//source/filter/FontStyle.cxx
---- writerperfect//source/filter/FontStyle.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/FontStyle.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/FontStyle.cxx writerperfect/source/filter/FontStyle.cxx
+--- writerperfect/source/filter/FontStyle.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/FontStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -29,7 +29,7 @@
#include "DocumentElement.hxx"
@@ -1972,9 +1972,9 @@ diff -u -r -N writerperfect//source/filter/FontStyle.cxx writerperfect//source/f
+ TagCloseElement styleClose("style:font-face");
styleClose.write(pHandler);
}
-diff -u -r -N writerperfect//source/filter/FontStyle.hxx writerperfect//source/filter/FontStyle.hxx
---- writerperfect//source/filter/FontStyle.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/FontStyle.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/FontStyle.hxx writerperfect/source/filter/FontStyle.hxx
+--- writerperfect/source/filter/FontStyle.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/FontStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -21,28 +21,23 @@
*
*/
@@ -2007,9 +2007,9 @@ diff -u -r -N writerperfect//source/filter/FontStyle.hxx writerperfect//source/f
const WPXString &getFontFamily() const { return msFontFamily; }
private:
-diff -u -r -N writerperfect//source/filter/GraphicsStyle.cxx writerperfect//source/filter/GraphicsStyle.cxx
---- writerperfect//source/filter/GraphicsStyle.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/GraphicsStyle.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/GraphicsStyle.cxx writerperfect/source/filter/GraphicsStyle.cxx
+--- writerperfect/source/filter/GraphicsStyle.cxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/GraphicsStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,40 @@
+/* GraphicsStyle:
+ *
@@ -2051,9 +2051,9 @@ diff -u -r -N writerperfect//source/filter/GraphicsStyle.cxx writerperfect//sour
+void GraphicsStyle::write(DocumentHandlerInterface * /* pHandler */) const
+{
+}
-diff -u -r -N writerperfect//source/filter/GraphicsStyle.hxx writerperfect//source/filter/GraphicsStyle.hxx
---- writerperfect//source/filter/GraphicsStyle.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/GraphicsStyle.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/GraphicsStyle.hxx writerperfect/source/filter/GraphicsStyle.hxx
+--- writerperfect/source/filter/GraphicsStyle.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/GraphicsStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,40 @@
+/* GraphicsStyle:
+ *
@@ -2095,9 +2095,9 @@ diff -u -r -N writerperfect//source/filter/GraphicsStyle.hxx writerperfect//sour
+ virtual void write(DocumentHandlerInterface *pHandler) const;
+};
+#endif
-diff -u -r -N writerperfect//source/filter/InternalHandler.cxx writerperfect//source/filter/InternalHandler.cxx
---- writerperfect//source/filter/InternalHandler.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/InternalHandler.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/InternalHandler.cxx writerperfect/source/filter/InternalHandler.cxx
+--- writerperfect/source/filter/InternalHandler.cxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/InternalHandler.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2007 Fridrich Strba .strba at bluewin.ch)
@@ -2153,9 +2153,9 @@ diff -u -r -N writerperfect//source/filter/InternalHandler.cxx writerperfect//so
+{
+ mpElements->push_back(new CharDataElement(sCharacters.cstr()));
+}
-diff -u -r -N writerperfect//source/filter/InternalHandler.hxx writerperfect//source/filter/InternalHandler.hxx
---- writerperfect//source/filter/InternalHandler.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/InternalHandler.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/InternalHandler.hxx writerperfect/source/filter/InternalHandler.hxx
+--- writerperfect/source/filter/InternalHandler.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/InternalHandler.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2007 Fridrich Strba .strba at bluewin.ch)
@@ -2203,9 +2203,9 @@ diff -u -r -N writerperfect//source/filter/InternalHandler.hxx writerperfect//so
+ std::vector<DocumentElement *> *mpElements;
+};
+#endif
-diff -u -r -N writerperfect//source/filter/ListStyle.cxx writerperfect//source/filter/ListStyle.cxx
---- writerperfect//source/filter/ListStyle.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/ListStyle.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/ListStyle.cxx writerperfect/source/filter/ListStyle.cxx
+--- writerperfect/source/filter/ListStyle.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/ListStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -29,7 +29,7 @@
#include "DocumentElement.hxx"
@@ -2335,9 +2335,9 @@ diff -u -r -N writerperfect//source/filter/ListStyle.cxx writerperfect//source/f
{
TagOpenElement listStyleOpenElement("text:list-style");
listStyleOpenElement.addAttribute("style:name", getName());
-diff -u -r -N writerperfect//source/filter/ListStyle.hxx writerperfect//source/filter/ListStyle.hxx
---- writerperfect//source/filter/ListStyle.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/ListStyle.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/ListStyle.hxx writerperfect/source/filter/ListStyle.hxx
+--- writerperfect/source/filter/ListStyle.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/ListStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -21,23 +21,18 @@
*
*/
@@ -2399,9 +2399,9 @@ diff -u -r -N writerperfect//source/filter/ListStyle.hxx writerperfect//source/f
int getListID() const { return miListID; }
bool isListLevelDefined(int iLevel) const;
-diff -u -r -N writerperfect//source/filter/makefile.mk writerperfect//source/filter/makefile.mk
---- writerperfect//source/filter/makefile.mk 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/makefile.mk 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/makefile.mk writerperfect/source/filter/makefile.mk
+--- writerperfect/source/filter/makefile.mk 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/makefile.mk 2008-11-17 22:07:19.000000000 +0100
@@ -10,6 +10,10 @@
INCPRE+=$(LIBWPD_CFLAGS)
.ENDIF
@@ -2440,9 +2440,9 @@ diff -u -r -N writerperfect//source/filter/makefile.mk writerperfect//source/fil
+ $(SLO)$/TextRunStyle.obj
.INCLUDE : target.mk
-diff -u -r -N writerperfect//source/filter/OdgExporter.cxx writerperfect//source/filter/OdgExporter.cxx
---- writerperfect//source/filter/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/OdgExporter.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/OdgExporter.cxx writerperfect/source/filter/OdgExporter.cxx
+--- writerperfect/source/filter/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/OdgExporter.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,647 @@
+/* libwpg
+ * Copyright (C) 2006 Ariya Hidayat (ariya at kde.org)
@@ -3091,9 +3091,9 @@ diff -u -r -N writerperfect//source/filter/OdgExporter.cxx writerperfect//source
+ }
+ return WPXString(stringValue.c_str());
+}
-diff -u -r -N writerperfect//source/filter/OdgExporter.hxx writerperfect//source/filter/OdgExporter.hxx
---- writerperfect//source/filter/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect//source/filter/OdgExporter.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/OdgExporter.hxx writerperfect/source/filter/OdgExporter.hxx
+--- writerperfect/source/filter/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect/source/filter/OdgExporter.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,89 @@
+/* libwpg
+ * Copyright (C) 2006 Ariya Hidayat (ariya at kde.org)
@@ -3184,9 +3184,9 @@ diff -u -r -N writerperfect//source/filter/OdgExporter.hxx writerperfect//source
+};
+
+#endif // __ODGEXPORTER_HXX__
-diff -u -r -N writerperfect//source/filter/PageSpan.cxx writerperfect//source/filter/PageSpan.cxx
---- writerperfect//source/filter/PageSpan.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/PageSpan.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/PageSpan.cxx writerperfect/source/filter/PageSpan.cxx
+--- writerperfect/source/filter/PageSpan.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/PageSpan.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -87,39 +87,38 @@
return 0; // should never happen
}
@@ -3326,9 +3326,9 @@ diff -u -r -N writerperfect//source/filter/PageSpan.cxx writerperfect//source/fi
- headerFooterClose.write(pHandler);
}
-
-diff -u -r -N writerperfect//source/filter/PageSpan.hxx writerperfect//source/filter/PageSpan.hxx
---- writerperfect//source/filter/PageSpan.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/PageSpan.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/PageSpan.hxx writerperfect/source/filter/PageSpan.hxx
+--- writerperfect/source/filter/PageSpan.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/PageSpan.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -26,25 +26,20 @@
*/
#ifndef _PAGESPAN_H
@@ -3368,9 +3368,9 @@ diff -u -r -N writerperfect//source/filter/PageSpan.hxx writerperfect//source/fi
private:
WPXPropertyList mxPropList;
std::vector<DocumentElement *> * mpHeaderContent;
-diff -u -r -N writerperfect//source/filter/SectionStyle.cxx writerperfect//source/filter/SectionStyle.cxx
---- writerperfect//source/filter/SectionStyle.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/SectionStyle.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/SectionStyle.cxx writerperfect/source/filter/SectionStyle.cxx
+--- writerperfect/source/filter/SectionStyle.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/SectionStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -33,7 +33,7 @@
#ifdef _MSC_VER
@@ -3417,9 +3417,9 @@ diff -u -r -N writerperfect//source/filter/SectionStyle.cxx writerperfect//sourc
pHandler->endElement("style:style");
}
-diff -u -r -N writerperfect//source/filter/SectionStyle.hxx writerperfect//source/filter/SectionStyle.hxx
---- writerperfect//source/filter/SectionStyle.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/SectionStyle.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/SectionStyle.hxx writerperfect/source/filter/SectionStyle.hxx
+--- writerperfect/source/filter/SectionStyle.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/SectionStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -21,19 +21,13 @@
*
*/
@@ -3454,9 +3454,9 @@ diff -u -r -N writerperfect//source/filter/SectionStyle.hxx writerperfect//sourc
WPXPropertyListVector mColumns;
};
#endif
-diff -u -r -N writerperfect//source/filter/Style.hxx writerperfect//source/filter/Style.hxx
---- writerperfect//source/filter/Style.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/Style.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/Style.hxx writerperfect/source/filter/Style.hxx
+--- writerperfect/source/filter/Style.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/Style.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -21,19 +21,13 @@
*
*/
@@ -3487,9 +3487,9 @@ diff -u -r -N writerperfect//source/filter/Style.hxx writerperfect//source/filte
const WPXString &getName() const { return msName; }
private:
-diff -u -r -N writerperfect//source/filter/TableStyle.cxx writerperfect//source/filter/TableStyle.cxx
---- writerperfect//source/filter/TableStyle.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/TableStyle.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/TableStyle.cxx writerperfect/source/filter/TableStyle.cxx
+--- writerperfect/source/filter/TableStyle.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/TableStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -27,7 +27,6 @@
* Corel Corporation or Corel Corporation Limited."
*/
@@ -3606,9 +3606,9 @@ diff -u -r -N writerperfect//source/filter/TableStyle.cxx writerperfect//source/
pHandler->endElement("style:style");
-diff -u -r -N writerperfect//source/filter/TableStyle.hxx writerperfect//source/filter/TableStyle.hxx
---- writerperfect//source/filter/TableStyle.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/TableStyle.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/TableStyle.hxx writerperfect/source/filter/TableStyle.hxx
+--- writerperfect/source/filter/TableStyle.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/TableStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -38,15 +38,16 @@
#include "Style.hxx"
@@ -3650,9 +3650,9 @@ diff -u -r -N writerperfect//source/filter/TableStyle.hxx writerperfect//source/
int getNumColumns() const { return mColumns.count(); }
void addTableCellStyle(TableCellStyle *pTableCellStyle) { mTableCellStyles.push_back(pTableCellStyle); }
int getNumTableCellStyles() { return mTableCellStyles.size(); }
-diff -u -r -N writerperfect//source/filter/TextRunStyle.cxx writerperfect//source/filter/TextRunStyle.cxx
---- writerperfect//source/filter/TextRunStyle.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/TextRunStyle.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/TextRunStyle.cxx writerperfect/source/filter/TextRunStyle.cxx
+--- writerperfect/source/filter/TextRunStyle.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/TextRunStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -50,91 +50,95 @@
delete mpPropList;
}
@@ -3830,9 +3830,9 @@ diff -u -r -N writerperfect//source/filter/TextRunStyle.cxx writerperfect//sourc
+ pHandler->endElement("style:text-properties");
pHandler->endElement("style:style");
}
-diff -u -r -N writerperfect//source/filter/TextRunStyle.hxx writerperfect//source/filter/TextRunStyle.hxx
---- writerperfect//source/filter/TextRunStyle.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/TextRunStyle.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/TextRunStyle.hxx writerperfect/source/filter/TextRunStyle.hxx
+--- writerperfect/source/filter/TextRunStyle.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/TextRunStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -29,26 +29,19 @@
#ifndef _TEXTRUNSTYLE_H
@@ -3870,18 +3870,18 @@ diff -u -r -N writerperfect//source/filter/TextRunStyle.hxx writerperfect//sourc
private:
WPXPropertyList mPropList;
-diff -u -r -N writerperfect//source/filter/WriterProperties.hxx writerperfect//source/filter/WriterProperties.hxx
---- writerperfect//source/filter/WriterProperties.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/filter/WriterProperties.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/filter/WriterProperties.hxx writerperfect/source/filter/WriterProperties.hxx
+--- writerperfect/source/filter/WriterProperties.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/filter/WriterProperties.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -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
-diff -u -r -N writerperfect//source/stream/WPXSvStream.cxx writerperfect//source/stream/WPXSvStream.cxx
---- writerperfect//source/stream/WPXSvStream.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/stream/WPXSvStream.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/stream/WPXSvStream.cxx writerperfect/source/stream/WPXSvStream.cxx
+--- writerperfect/source/stream/WPXSvStream.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/stream/WPXSvStream.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -9,7 +9,7 @@
using namespace ::com::sun::star::io;
@@ -3918,9 +3918,9 @@ diff -u -r -N writerperfect//source/stream/WPXSvStream.cxx writerperfect//source
-{
- return getDocumentOLEStream( "PerfectOffice_MAIN" );
-}
-diff -u -r -N writerperfect//source/stream/WPXSvStream.h writerperfect//source/stream/WPXSvStream.h
---- writerperfect//source/stream/WPXSvStream.h 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/stream/WPXSvStream.h 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/stream/WPXSvStream.h writerperfect/source/stream/WPXSvStream.h
+--- writerperfect/source/stream/WPXSvStream.h 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/stream/WPXSvStream.h 2008-11-17 22:07:19.000000000 +0100
@@ -12,13 +12,12 @@
#if defined _MSC_VER
#pragma warning( push, 1 )
@@ -3949,9 +3949,9 @@ diff -u -r -N writerperfect//source/stream/WPXSvStream.h writerperfect//source/s
virtual int seek(long offset, WPX_SEEK_TYPE seekType);
virtual long tell();
virtual bool atEOS();
-diff -u -r -N writerperfect//source/wpdimp/makefile.mk writerperfect//source/wpdimp/makefile.mk
---- writerperfect//source/wpdimp/makefile.mk 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpdimp/makefile.mk 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpdimp/makefile.mk writerperfect/source/wpdimp/makefile.mk
+--- writerperfect/source/wpdimp/makefile.mk 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpdimp/makefile.mk 2008-11-17 22:07:19.000000000 +0100
@@ -10,6 +10,10 @@
INCPRE+=$(LIBWPD_CFLAGS)
.ENDIF
@@ -3963,9 +3963,9 @@ diff -u -r -N writerperfect//source/wpdimp/makefile.mk writerperfect//source/wpd
.IF "$(SYSTEM_LIBWPS)" == "YES"
INCPRE+=$(LIBWPS_CFLAGS)
.ENDIF
-diff -u -r -N writerperfect//source/wpdimp/WordPerfectCollector.cxx writerperfect//source/wpdimp/WordPerfectCollector.cxx
---- writerperfect//source/wpdimp/WordPerfectCollector.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpdimp/WordPerfectCollector.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpdimp/WordPerfectCollector.cxx writerperfect/source/wpdimp/WordPerfectCollector.cxx
+--- writerperfect/source/wpdimp/WordPerfectCollector.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpdimp/WordPerfectCollector.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -35,8 +35,9 @@
#pragma warning( pop )
#endif
@@ -3994,9 +3994,9 @@ diff -u -r -N writerperfect//source/wpdimp/WordPerfectCollector.cxx writerperfec
if (result != WPD_OK)
return false;
-diff -u -r -N writerperfect//source/wpdimp/WordPerfectCollector.hxx writerperfect//source/wpdimp/WordPerfectCollector.hxx
---- writerperfect//source/wpdimp/WordPerfectCollector.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpdimp/WordPerfectCollector.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpdimp/WordPerfectCollector.hxx writerperfect/source/wpdimp/WordPerfectCollector.hxx
+--- writerperfect/source/wpdimp/WordPerfectCollector.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpdimp/WordPerfectCollector.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -30,12 +30,16 @@
#define _WORDPERFECTCOLLECTOR_HXX
@@ -4016,9 +4016,9 @@ diff -u -r -N writerperfect//source/wpdimp/WordPerfectCollector.hxx writerperfec
+ rtl::OString maUtf8Password;
};
#endif
-diff -u -r -N writerperfect//source/wpdimp/WordPerfectImportFilter.cxx writerperfect//source/wpdimp/WordPerfectImportFilter.cxx
---- writerperfect//source/wpdimp/WordPerfectImportFilter.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpdimp/WordPerfectImportFilter.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpdimp/WordPerfectImportFilter.cxx writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
+--- writerperfect/source/wpdimp/WordPerfectImportFilter.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpdimp/WordPerfectImportFilter.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -29,27 +29,19 @@
*/
@@ -4269,9 +4269,9 @@ diff -u -r -N writerperfect//source/wpdimp/WordPerfectImportFilter.cxx writerper
+{
+ return (cppu::OWeakObject*) new WordPerfectImportFilterDialog( rSMgr );
+}
-diff -u -r -N writerperfect//source/wpdimp/WordPerfectImportFilter.hxx writerperfect//source/wpdimp/WordPerfectImportFilter.hxx
---- writerperfect//source/wpdimp/WordPerfectImportFilter.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpdimp/WordPerfectImportFilter.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpdimp/WordPerfectImportFilter.hxx writerperfect/source/wpdimp/WordPerfectImportFilter.hxx
+--- writerperfect/source/wpdimp/WordPerfectImportFilter.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpdimp/WordPerfectImportFilter.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -32,9 +32,13 @@
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XImporter.hpp>
@@ -4347,9 +4347,9 @@ diff -u -r -N writerperfect//source/wpdimp/WordPerfectImportFilter.hxx writerper
+ throw ( ::com::sun::star::uno::Exception );
+
#endif
-diff -u -r -N writerperfect//source/wpdimp/wpft_genericfilter.cxx writerperfect//source/wpdimp/wpft_genericfilter.cxx
---- writerperfect//source/wpdimp/wpft_genericfilter.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpdimp/wpft_genericfilter.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpdimp/wpft_genericfilter.cxx writerperfect/source/wpdimp/wpft_genericfilter.cxx
+--- writerperfect/source/wpdimp/wpft_genericfilter.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpdimp/wpft_genericfilter.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -55,14 +55,22 @@
{
sal_Int32 nPos = 0;
@@ -4407,9 +4407,9 @@ diff -u -r -N writerperfect//source/wpdimp/wpft_genericfilter.cxx writerperfect/
return pRet;
}
}
-diff -u -r -N writerperfect//source/wpgimp/makefile.mk writerperfect//source/wpgimp/makefile.mk
---- writerperfect//source/wpgimp/makefile.mk 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpgimp/makefile.mk 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpgimp/makefile.mk writerperfect/source/wpgimp/makefile.mk
+--- writerperfect/source/wpgimp/makefile.mk 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpgimp/makefile.mk 2008-11-17 22:07:19.000000000 +0100
@@ -12,12 +12,6 @@
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
.ENDIF
@@ -4431,9 +4431,9 @@ diff -u -r -N writerperfect//source/wpgimp/makefile.mk writerperfect//source/wpg
$(SLO)$/WPGImportFilter.obj \
$(SLO)$/wpgimport_genericfilter.obj
-diff -u -r -N writerperfect//source/wpgimp/WPGImportFilter.cxx writerperfect//source/wpgimp/WPGImportFilter.cxx
---- writerperfect//source/wpgimp/WPGImportFilter.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpgimp/WPGImportFilter.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpgimp/WPGImportFilter.cxx writerperfect/source/wpgimp/WPGImportFilter.cxx
+--- writerperfect/source/wpgimp/WPGImportFilter.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpgimp/WPGImportFilter.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -75,7 +75,7 @@
#endif
@@ -4477,9 +4477,9 @@ diff -u -r -N writerperfect//source/wpgimp/WPGImportFilter.cxx writerperfect//so
if (libwpg::WPGraphics::isSupported(input))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_WordPerfect_Graphics" ) );
-diff -u -r -N writerperfect//source/wpsimp/MSWorksCollector.cxx writerperfect//source/wpsimp/MSWorksCollector.cxx
---- writerperfect//source/wpsimp/MSWorksCollector.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpsimp/MSWorksCollector.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpsimp/MSWorksCollector.cxx writerperfect/source/wpsimp/MSWorksCollector.cxx
+--- writerperfect/source/wpsimp/MSWorksCollector.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpsimp/MSWorksCollector.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -29,7 +29,7 @@
#include "MSWorksCollector.hxx"
#include <libwps/WPSDocument.h>
@@ -4501,9 +4501,9 @@ diff -u -r -N writerperfect//source/wpsimp/MSWorksCollector.cxx writerperfect//s
if (result != WPS_OK)
return false;
-diff -u -r -N writerperfect//source/wpsimp/MSWorksCollector.hxx writerperfect//source/wpsimp/MSWorksCollector.hxx
---- writerperfect//source/wpsimp/MSWorksCollector.hxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpsimp/MSWorksCollector.hxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpsimp/MSWorksCollector.hxx writerperfect/source/wpsimp/MSWorksCollector.hxx
+--- writerperfect/source/wpsimp/MSWorksCollector.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpsimp/MSWorksCollector.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -30,12 +30,13 @@
#define _MSWORKSCOLLECTOR_HXX
@@ -4520,9 +4520,9 @@ diff -u -r -N writerperfect//source/wpsimp/MSWorksCollector.hxx writerperfect//s
+ bool parseSourceDocument(WPXInputStream &input);
};
#endif
-diff -u -r -N writerperfect//source/wpsimp/MSWorksImportFilter.cxx writerperfect//source/wpsimp/MSWorksImportFilter.cxx
---- writerperfect//source/wpsimp/MSWorksImportFilter.cxx 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//source/wpsimp/MSWorksImportFilter.cxx 2008-11-17 22:07:19.000000000 +0100
+diff -u -r -N writerperfect/source/wpsimp/MSWorksImportFilter.cxx writerperfect/source/wpsimp/MSWorksImportFilter.cxx
+--- writerperfect/source/wpsimp/MSWorksImportFilter.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/source/wpsimp/MSWorksImportFilter.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -127,7 +127,7 @@
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
@@ -4541,25 +4541,25 @@ diff -u -r -N writerperfect//source/wpsimp/MSWorksImportFilter.cxx writerperfect
if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence == WPS_CONFIDENCE_GOOD))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_MS_Works_Document" ) );
-diff -u -r -N writerperfect//util/makefile.mk writerperfect//util/makefile.mk
---- writerperfect//util/makefile.mk 2008-11-17 22:06:28.000000000 +0100
-+++ writerperfect//util/makefile.mk 2008-11-17 22:07:19.000000000 +0100
-@@ -44,6 +44,8 @@
- $(SOTLIB) \
- $(SO2LIB) \
- $(SVTOOLLIB) \
-+ $(SFXLIB) \
-+ $(VCLLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(COMPHELPERLIB) \
-@@ -52,7 +54,8 @@
- $(CPPULIB) \
- $(SALLIB) \
- $(XMLOFFLIB) \
-- $(LIBWPD)
-+ $(LIBWPD) \
-+ $(LIBWPG)
+diff -u -r -N writerperfect/util/makefile.mk writerperfect/util/makefile.mk
+--- writerperfect/util/makefile.mk 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect/util/makefile.mk 2008-11-17 22:07:19.000000000 +0100
+@@ -42,6 +42,8 @@
+ SHL1STDLIBS+= \
+ $(SOTLIB) \
+ $(SO2LIB) \
++ $(SFXLIB) \
++ $(VCLLIB) \
+ $(UNOTOOLSLIB) \
+ $(TOOLSLIB) \
+ $(UCBHELPERLIB) \
+@@ -49,7 +51,8 @@
+ $(CPPULIB) \
+ $(SALLIB) \
+ $(XMLOFFLIB) \
+- $(LIBWPD)
++ $(LIBWPD) \
++ $(LIBWPG)
SHL1TARGET = wpft$(DLLPOSTFIX)
SHL1IMPLIB = i$(SHL1TARGET)
@@ -4568,8 +4568,8 @@ diff -u -r -N writerperfect//util/makefile.mk writerperfect//util/makefile.mk
$(XMLOFFLIB) \
$(LIBWPS) \
- $(LIBWPD)
-+ $(LIBWPD) \
-+ $(LIBWPG)
++ $(LIBWPD) \
++ $(LIBWPG)
SHL2TARGET = msworks$(DLLPOSTFIX)
SHL2IMPLIB = i$(SHL2TARGET)
More information about the ooo-build-commit
mailing list