[ooo-build-commit] .: 2 commits - patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 02:36:35 PDT 2010
patches/dev300/apply | 58
patches/dev300/external-package-glib2.diff | 71
patches/dev300/libwpd.diff | 23
patches/dev300/libwpg.diff | 117 -
patches/dev300/libwps.diff | 208 --
patches/dev300/moz-solaris11-makefiles.diff | 129 -
patches/dev300/oowintool-java6.diff | 19
patches/dev300/scp2-package-glib2.diff | 274 ---
patches/dev300/setup_native-package-glib2.diff | 26
patches/dev300/stlport-solaris-fileno.diff | 35
patches/dev300/upgrade-zlib-to-1.2.3.diff | 111 -
patches/dev300/win32-avoid-uac.diff | 15
patches/dev300/win32-boost-crack.diff | 17
patches/dev300/win32-pdfimport-use-temporary-file.diff | 26
patches/dev300/wpgimporter.diff | 1439 ----------------
patches/dev300/wps-registry.diff | 27
patches/dev300/wpsimport-config_office.diff | 61
patches/dev300/wpsimport-filter.diff | 68
patches/dev300/wpsimport-scp2.diff | 34
patches/dev300/wpsimport-writerperfect.diff | 1037 -----------
patches/dev300/writerperfect-nocondensedparagraphs.diff | 25
21 files changed, 3 insertions(+), 3817 deletions(-)
New commits:
commit 35cd9a19e43957002b3f74f7ccd0170b707345f7
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 11:32:20 2010 +0200
Migrate WPS and WPG section to git and some other safe patches.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3d977ef..e673908 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -13,8 +13,8 @@ OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0
Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
- GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
- Layout, VBABits, VBAObjects, CalcErrors, CJK, GCJ, Lwp, WPS, \
+ GStreamer, CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
+ Layout, VBABits, VBAObjects, CalcErrors, CJK, GCJ, Lwp, \
OOXML, OOXMLExportDevel, OOXMLExport, FrameworkFeature, UnitTesting, \
PopupRemoval, InternalCairo, \
FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
@@ -287,28 +287,8 @@ cjk-default-compatibility.diff, i#54320, cbosdo
# for mixed font set
#FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
-[ WPS ]
-# MS Works import filter (following patches depend on each other) Fridrich
-
-wpsimport-config_office.diff
-wpsimport-filter.diff
-wpsimport-scp2.diff
-
-wpsimport-writerperfect.diff
-libwps.diff
-
-# readd WPS. (removed in cws native214/m40)
-wps-registry.diff
-
[ CWSBackports ]
-
-[ WPG ]
-# libwpg-based import filter for WordPerfect Graphics/
-libwpg.diff
-
-wpgimporter.diff
-
[ GCJ ]
# gij/libgcj paths...
jvmfwk-gij-paths.diff, rengelha
@@ -333,10 +313,6 @@ uses-vfs.diff, i#43504, michael
# the -fvisibility-inlines-hidden
buildfix-x86-64-visibility-workaround.diff
-#upload a new libwpd + fix an exception with condensed paragraphs
-libwpd.diff, fridrich
-writerperfect-nocondensedparagraphs.diff, fridrich
-
offapi-typecheck-whitelist.diff, thorsten
# re-direct to plugins via http://extensions.go-oo.org/
@@ -1267,9 +1243,6 @@ warning-return-values-registry.diff, i#58979, pmladek
# fixes warnings about that a variable is used unitialized
warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
-#fix a build issue on solaris with sunpro 5.9 aka Sun Studio 12
-stlport-solaris-fileno.diff, fridrich
-
[ BFBuildBits ]
SectionOwner => pmladek
@@ -1279,13 +1252,6 @@ binfilter-stl.diff, i#63770, hmth
# use -Wl,--as-needed, save 1% of relocations
link-as-needed-bf.diff, i#89511, pmladek
-[ SystemBuildBits ]
-# !!!! applied only when libs_extern_sys source tarball is unpacked !!!!
-SectionOwner => fridrich
-
-# Mozilla build-bits to not break on Solaris 11
-# moz-solaris11-makefiles.diff, fridrich
-
[ LinuxOnly ]
system-python-ure-bootstrap.diff, deb#501028, i#90701
@@ -2998,15 +2964,6 @@ svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
# correctly import connector style attribute.
# FIXME ooo3330-m4: doesn't apply in m3f svx-msdff-import-connector-style-fix.diff, n#631804, kohei
-[ Win32Only ]
-# FIXME dev300-m77: Doesn't apply, maybe not needed
-# win32-boost-crack.diff
-
-win32-pdfimport-use-temporary-file.diff, n#569319, fridrich
-
-# FIXME dev300-m77: I think upstream now works around UAC using slightly different code
-# win32-avoid-uac.diff, i#111232, tml
-
[ NovellOnly ]
# remove Macro Recorder from UI since it is borked by design
basctl-no-macro-recorder-in-ui.diff, fridrich
@@ -3363,9 +3320,6 @@ valgrind-fixes.diff, thorsten
framework-menubar-fix.diff, thorsten
[ BuildBits ]
-# Allow oowintool to detect java sdk 1.6.x
-oowintool-java6.diff, fridrich
-
# make python build properly on win32
python-win32-buildfix.diff, thorsten
# force WINVER when using non-std win api
@@ -3491,7 +3445,6 @@ oox-build-fix-dev300-m77.diff, kohei
sd-pptx-export-build-fix.diff, rodo
sd-pptx-export-build-fix-2.diff, rodo
oox-import-fix-ole2-shapes.diff, n#593611, rodo
-upgrade-zlib-to-1.2.3.diff, fridrich
svx-fix-layout-build.diff, rodo
sfx2-style-edit-greyentry.diff, i#85003, simonaw
diff --git a/patches/dev300/libwpd.diff b/patches/dev300/libwpd.diff
deleted file mode 100644
index 42a1773..0000000
--- a/patches/dev300/libwpd.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- libwpd/makefile.mk | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git libwpd/makefile.mk libwpd/makefile.mk
-index abca6ff..104d79f 100644
---- libwpd/makefile.mk
-+++ libwpd/makefile.mk
-@@ -41,9 +41,8 @@ TARGET=wpd
- @echo "Using system libwpd..."
- .ENDIF
-
--TARFILE_NAME=libwpd-0.8.8
--TARFILE_MD5=cd5997284f4ba1e8dde5d1e5869fc342
--PATCH_FILES=$(TARFILE_NAME).diff
-+TARFILE_NAME=libwpd-0.8.14
-+TARFILE_MD5=64d66018897d759358f454010b6e75d2
- BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
- BUILD_DIR=src$/lib
-
---
-1.7.0.1
-
diff --git a/patches/dev300/libwpg.diff b/patches/dev300/libwpg.diff
deleted file mode 100644
index 5970773..0000000
--- a/patches/dev300/libwpg.diff
+++ /dev/null
@@ -1,117 +0,0 @@
----
- libwpg/makefile.mk | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
- libwpg/prj/build.lst | 3 ++
- libwpg/prj/d.lst | 16 +++++++++++
- 3 files changed, 87 insertions(+), 0 deletions(-)
- create mode 100644 libwpg/makefile.mk
- create mode 100644 libwpg/prj/build.lst
- create mode 100644 libwpg/prj/d.lst
-
-diff --git libwpg/makefile.mk libwpg/makefile.mk
-new file mode 100644
-index 0000000..07b269e
---- /dev/null
-+++ libwpg/makefile.mk
-@@ -0,0 +1,68 @@
-+#*************************************************************************
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.1 $
-+#
-+# last change: $Author: fridrich_strba $ $Date: 2006/12/18 16:48:06 $
-+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, as published by the Free Software Foundation.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+# MA 02111-1307 USA
-+#
-+#*************************************************************************
-+
-+PRJ=.
-+
-+PRJNAME=wpg
-+TARGET=wpg
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(SYSTEM_LIBWPG)" == "YES"
-+ at all:
-+ @echo "Using system libwpg..."
-+.ENDIF
-+
-+# libwpg depends on the libwpd framework
-+.IF "$(SYSTEM_LIBWPD)" == "YES"
-+INCPRE+=$(LIBWPD_CFLAGS)
-+.ELSE
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-+.ENDIF
-+
-+TARFILE_NAME=libwpg-0.1.3
-+TARFILE_MD5=db556b750bf3eac8481a4cc5e29e5af1
-+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-+BUILD_DIR=src/lib
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : set_ext.mk
-+.INCLUDE : target.mk
-+.INCLUDE : tg_ext.mk
-diff --git libwpg/prj/build.lst libwpg/prj/build.lst
-new file mode 100644
-index 0000000..d54a1d9
---- /dev/null
-+++ libwpg/prj/build.lst
-@@ -0,0 +1,3 @@
-+lwpg libwpg : LIBWPD:libwpd soltools NULL
-+lwpg libwpg usr1 - all lwpg_mkout NULL
-+lwpg libwpg nmake - all lwpg_libwpg NULL
-diff --git libwpg/prj/d.lst libwpg/prj/d.lst
-new file mode 100644
-index 0000000..d01a25a
---- /dev/null
-+++ libwpg/prj/d.lst
-@@ -0,0 +1,16 @@
-+mkdir: %_DEST%\inc%_EXT%\libwpg
-+..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGBitmap.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGBinaryData.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGBrush.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGColor.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGGradient.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGPath.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGPen.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGPoint.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGRect.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\misc\build\libwpg*\src\lib\WPGString.h %_DEST%\inc%_EXT%\libwpg\
-+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-+..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
---
-1.7.0.1
-
diff --git a/patches/dev300/libwps.diff b/patches/dev300/libwps.diff
deleted file mode 100644
index fa1a031..0000000
--- a/patches/dev300/libwps.diff
+++ /dev/null
@@ -1,208 +0,0 @@
----
- libwps/libwps-0.1.1.diff | 93 ++++++++++++++++++++++++++++++++++++++++++++++
- libwps/makefile.mk | 68 +++++++++++++++++++++++++++++++++
- libwps/prj/build.lst | 3 +
- libwps/prj/d.lst | 6 +++
- 4 files changed, 170 insertions(+), 0 deletions(-)
- create mode 100644 libwps/libwps-0.1.1.diff
- create mode 100644 libwps/makefile.mk
- create mode 100644 libwps/prj/build.lst
- create mode 100644 libwps/prj/d.lst
-
-diff --git libwps/libwps-0.1.1.diff libwps/libwps-0.1.1.diff
-new file mode 100644
-index 0000000..6977cf3
---- /dev/null
-+++ libwps/libwps-0.1.1.diff
-@@ -0,0 +1,93 @@
-+*** misc/libwps-0.1.1/src/lib/WPSListener.h Thu Nov 29 20:58:57 2007
-+--- misc/build/libwps-0.1.1/src/lib/WPSListener.h Sun Dec 2 20:54:35 2007
-+***************
-+*** 39,45 ****
-+ virtual ~WPSListener();
-+
-+ bool isUndoOn() { return m_isUndoOn; }
-+! void setUndoOn(bool isUndoOn) { m_isUndoOn = isUndoOn; }
-+
-+ std::list<WPSPageSpan> &m_pageList;
-+
-+--- 39,45 ----
-+ virtual ~WPSListener();
-+
-+ bool isUndoOn() { return m_isUndoOn; }
-+! void setUndoOn(bool undoOn) { m_isUndoOn = undoOn; }
-+
-+ std::list<WPSPageSpan> &m_pageList;
-+
-+*** misc/libwps-0.1.1/src/lib/WPSContentListener.cpp Thu Nov 29 20:58:57 2007
-+--- misc/build/libwps-0.1.1/src/lib/WPSContentListener.cpp Sun Dec 2 21:09:11 2007
-+***************
-+*** 36,62 ****
-+ #define LIBWPS_MAX std::max
-+ #endif
-+
-+- namespace {
-+-
-+- WPXString doubleToString(const double value)
-+- {
-+- WPXString tempString;
-+- tempString.sprintf("%.4f", value);
-+- std::string decimalPoint(localeconv()->decimal_point);
-+- if ((decimalPoint.size() == 0) || (decimalPoint == "."))
-+- return tempString;
-+- std::string stringValue(tempString.cstr());
-+- if (!stringValue.empty())
-+- {
-+- std::string::size_type pos;
-+- while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
-+- stringValue.replace(pos,decimalPoint.size(),".");
-+- }
-+- return WPXString(stringValue.c_str());
-+- }
-+-
-+- } // namespace
-+-
-+ _WPSContentParsingState::_WPSContentParsingState() :
-+ m_textAttributeBits(0),
-+ m_fontSize(12.0f/*WP6_DEFAULT_FONT_SIZE*/), // FIXME ME!!!!!!!!!!!!!!!!!!! HELP WP6_DEFAULT_FONT_SIZE
-+--- 36,41 ----
-+***************
-+*** 578,585 ****
-+ _closePageSpan();
-+ }
-+
-+- const float WPS_DEFAULT_SUPER_SUB_SCRIPT = 58.0f;
-+-
-+ void WPSContentListener::_openSpan()
-+ {
-+ if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened)
-+--- 557,562 ----
-+***************
-+*** 622,639 ****
-+ }
-+
-+ WPXPropertyList propList;
-+! if (attributeBits & WPS_SUPERSCRIPT_BIT) {
-+! WPXString sSuperScript("super ");
-+! sSuperScript.append(doubleToString(WPS_DEFAULT_SUPER_SUB_SCRIPT));
-+! sSuperScript.append("%");
-+! propList.insert("style:text-position", sSuperScript);
-+! }
-+! else if (attributeBits & WPS_SUBSCRIPT_BIT) {
-+! WPXString sSubScript("sub ");
-+! sSubScript.append(doubleToString(WPS_DEFAULT_SUPER_SUB_SCRIPT));
-+! sSubScript.append("%");
-+! propList.insert("style:text-position", sSubScript);
-+! }
-+ if (attributeBits & WPS_ITALICS_BIT)
-+ propList.insert("fo:font-style", "italic");
-+ if (attributeBits & WPS_BOLD_BIT)
-+--- 599,608 ----
-+ }
-+
-+ WPXPropertyList propList;
-+! if (m_ps->m_textAttributeBits & WPS_SUPERSCRIPT_BIT)
-+! propList.insert("style:text-position", "super 58%");
-+! else if (m_ps->m_textAttributeBits & WPS_SUBSCRIPT_BIT)
-+! propList.insert("style:text-position", "sub 58%");
-+ if (attributeBits & WPS_ITALICS_BIT)
-+ propList.insert("fo:font-style", "italic");
-+ if (attributeBits & WPS_BOLD_BIT)
-diff --git libwps/makefile.mk libwps/makefile.mk
-new file mode 100644
-index 0000000..f50062a
---- /dev/null
-+++ libwps/makefile.mk
-@@ -0,0 +1,68 @@
-+#*************************************************************************
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.1 $
-+#
-+# last change: $Author: fridrich_strba $ $Date: 2006/12/18 16:48:06 $
-+#
-+# The Contents of this file are made available subject to
-+# the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+# GNU Lesser General Public License Version 2.1
-+# =============================================
-+# Copyright 2005 by Sun Microsystems, Inc.
-+# 901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License version 2.1, as published by the Free Software Foundation.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+# MA 02111-1307 USA
-+#
-+#*************************************************************************
-+
-+PRJ=.
-+
-+PRJNAME=wps
-+TARGET=wps
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+.IF "$(SYSTEM_LIBWPS)" == "YES"
-+ at all:
-+ @echo "Using system libwps..."
-+.ENDIF
-+
-+# libwps depends on the libwpd framework
-+.IF "$(SYSTEM_LIBWPD)" == "YES"
-+INCPRE+=$(LIBWPD_CFLAGS)
-+.ELSE
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-+.ENDIF
-+
-+TARFILE_NAME=libwps-0.1.2
-+TARFILE_MD5=799fc3b835a79adce8c88a3fee0150c1
-+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-+BUILD_DIR=src/lib
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : set_ext.mk
-+.INCLUDE : target.mk
-+.INCLUDE : tg_ext.mk
-diff --git libwps/prj/build.lst libwps/prj/build.lst
-new file mode 100644
-index 0000000..85004e1
---- /dev/null
-+++ libwps/prj/build.lst
-@@ -0,0 +1,3 @@
-+lwps libwps : LIBWPD:libwpd soltools NULL
-+lwps libwps usr1 - all lwps_mkout NULL
-+lwps libwps nmake - all lwps_libwps NULL
-diff --git libwps/prj/d.lst libwps/prj/d.lst
-new file mode 100644
-index 0000000..fe897d7
---- /dev/null
-+++ libwps/prj/d.lst
-@@ -0,0 +1,6 @@
-+mkdir: %_DEST%\inc%_EXT%\libwps
-+..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc%_EXT%\libwps\
-+..\%__SRC%\misc\build\libwps*\src\lib\WPSStream.h %_DEST%\inc%_EXT%\libwps\
-+..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc%_EXT%\libwps\
-+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-+..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
---
-1.7.0.1
-
diff --git a/patches/dev300/moz-solaris11-makefiles.diff b/patches/dev300/moz-solaris11-makefiles.diff
deleted file mode 100644
index 016cad5..0000000
--- a/patches/dev300/moz-solaris11-makefiles.diff
+++ /dev/null
@@ -1,129 +0,0 @@
---- moz/makefile.mk 25 May 2007 11:37:09 -0000 1.12
-+++ moz/makefile.mk 5 Nov 2007 16:35:11 -0000
-@@ -84,7 +84,9 @@
- MOZILLA_MAKE_VER=3.79.1
- WINTOOLS_ZIPFILE_NAME*=wintools.zip
-
--ADDITIONAL_FILES=mailnews$/addrbook$/src$/nsAbMD5sum.cpp
-+ADDITIONAL_FILES=mailnews$/addrbook$/src$/nsAbMD5sum.cpp \
-+ security$/coreconf$/SunOS5.11.mk \
-+ security$/coreconf$/SunOS5.11_i86pc.mk
-
- CONFIGURE_DIR=
- MOZILLA_CONFIGURE_FLAGS= $(SYSBASE_X11) --disable-tests \
---- moz/mozilla-source-1.7.5.patch 5 Jul 2007 09:04:04 -0000 1.15
-+++ moz/mozilla-source-1.7.5.patch 5 Nov 2007 16:30:03 -0000
-@@ -8174,6 +8174,113 @@
- ifdef BUILD_OPT
- OPTIMIZER = -O2
- endif
-+*** misc/mozilla/security/coreconf/SunOS5.11.mk Mon Nov 5 17:15:43 2007
-+--- misc/build/mozilla/security/coreconf/SunOS5.11.mk Mon Nov 5 17:14:30 2007
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,44 ----
-+! #
-+! # The contents of this file are subject to the Mozilla Public
-+! # License Version 1.1 (the "License"); you may not use this file
-+! # except in compliance with the License. You may obtain a copy of
-+! # the License at http://www.mozilla.org/MPL/
-+! #
-+! # Software distributed under the License is distributed on an "AS
-+! # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+! # implied. See the License for the specific language governing
-+! # rights and limitations under the License.
-+! #
-+! # The Original Code is the Netscape security libraries.
-+! #
-+! # The Initial Developer of the Original Code is Netscape
-+! # Communications Corporation. Portions created by Netscape are
-+! # Copyright (C) 1994-2000 Netscape Communications Corporation. All
-+! # Rights Reserved.
-+! #
-+! # Contributor(s):
-+! #
-+! # Alternatively, the contents of this file may be used under the
-+! # terms of the GNU General Public License Version 2 or later (the
-+! # "GPL"), in which case the provisions of the GPL are applicable
-+! # instead of those above. If you wish to allow use of your
-+! # version of this file only under the terms of the GPL and not to
-+! # allow others to use your version of this file under the MPL,
-+! # indicate your decision by deleting the provisions above and
-+! # replace them with the notice and other provisions required by
-+! # the GPL. If you do not delete the provisions above, a recipient
-+! # may use your version of this file under either the MPL or the
-+! # GPL.
-+! #
-+! # Config stuff for SunOS5.11
-+! #
-+!
-+! SOL_CFLAGS += -D_SVID_GETTOD
-+!
-+! include $(CORE_DEPTH)/coreconf/SunOS5.mk
-+!
-+! ifeq ($(OS_RELEASE),5.11)
-+! OS_DEFINES += -DSOLARIS2_11
-+! endif
-+!
-+! OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
-+*** misc/mozilla/security/coreconf/SunOS5.11_i86pc.mk Mon Nov 5 17:15:43 2007
-+--- misc/build/mozilla/security/coreconf/SunOS5.11_i86pc.mk Mon Nov 5 17:14:23 2007
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,51 ----
-+! #
-+! # The contents of this file are subject to the Mozilla Public
-+! # License Version 1.1 (the "License"); you may not use this file
-+! # except in compliance with the License. You may obtain a copy of
-+! # the License at http://www.mozilla.org/MPL/
-+! #
-+! # Software distributed under the License is distributed on an "AS
-+! # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+! # implied. See the License for the specific language governing
-+! # rights and limitations under the License.
-+! #
-+! # The Original Code is the Netscape security libraries.
-+! #
-+! # The Initial Developer of the Original Code is Netscape
-+! # Communications Corporation. Portions created by Netscape are
-+! # Copyright (C) 1994-2000 Netscape Communications Corporation. All
-+! # Rights Reserved.
-+! #
-+! # Contributor(s):
-+! #
-+! # Alternatively, the contents of this file may be used under the
-+! # terms of the GNU General Public License Version 2 or later (the
-+! # "GPL"), in which case the provisions of the GPL are applicable
-+! # instead of those above. If you wish to allow use of your
-+! # version of this file only under the terms of the GPL and not to
-+! # allow others to use your version of this file under the MPL,
-+! # indicate your decision by deleting the provisions above and
-+! # replace them with the notice and other provisions required by
-+! # the GPL. If you do not delete the provisions above, a recipient
-+! # may use your version of this file under either the MPL or the
-+! # GPL.
-+! #
-+! # Config stuff for Solaris 11 on x86
-+! #
-+!
-+! SOL_CFLAGS = -D_SVID_GETTOD
-+!
-+! include $(CORE_DEPTH)/coreconf/SunOS5.mk
-+!
-+! ifeq ($(USE_64),1)
-+! CPU_ARCH = x86_64
-+! else
-+! CPU_ARCH = x86
-+! OS_DEFINES += -Di386
-+! endif
-+!
-+! ifeq ($(OS_RELEASE),5.11_i86pc)
-+! OS_DEFINES += -DSOLARIS2_11
-+! endif
-+!
-+! OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
- *** misc/mozilla/security/coreconf/SunOS5.mk Sat Oct 16 01:52:29 2004
- --- misc/build/mozilla/security/coreconf/SunOS5.mk Tue Jan 15 13:34:36 2008
- ***************
diff --git a/patches/dev300/oowintool-java6.diff b/patches/dev300/oowintool-java6.diff
deleted file mode 100644
index f2895aa..0000000
--- a/patches/dev300/oowintool-java6.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- oowintool | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git oowintool oowintool
-index 0b4be43..8d2e475 100755
---- oowintool
-+++ oowintool
-@@ -265,6 +265,7 @@ sub print_jdk_dir()
- {
- my $dir =
- reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.5/JavaHome") ||
-+ reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.6/JavaHome") ||
- reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome") ||
- reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.3/JavaHome");
- print cygpath($dir, 'w', $output_format);
---
-1.7.0.1
-
diff --git a/patches/dev300/stlport-solaris-fileno.diff b/patches/dev300/stlport-solaris-fileno.diff
deleted file mode 100644
index 80a253b..0000000
--- a/patches/dev300/stlport-solaris-fileno.diff
+++ /dev/null
@@ -1,35 +0,0 @@
----
- stlport/STLport-4.0.patch | 17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git stlport/STLport-4.0.patch stlport/STLport-4.0.patch
-index 0d262b5..ea21ff9 100644
---- stlport/STLport-4.0.patch
-+++ stlport/STLport-4.0.patch
-@@ -3321,6 +3321,23 @@
- inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
- inline char* _FILE_I_end(const FILE& __f)
- ***************
-+*** 92,98 ****
-+ typedef unsigned char* _File_ptr_type;
-+ #endif
-+
-+! inline int _FILE_fd(const FILE& __f) { return __f._file; }
-+ inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
-+ inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
-+ inline char* _FILE_I_end(const FILE& __f)
-+--- 92,98 ----
-+ typedef unsigned char* _File_ptr_type;
-+ #endif
-+
-+! inline int _FILE_fd(const FILE& __f) { return fileno(__CONST_CAST(FILE*,&__f)); }
-+ inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
-+ inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
-+ inline char* _FILE_I_end(const FILE& __f)
-+***************
- *** 377,382 ****
- --- 380,388 ----
- # endif
---
-1.7.0.1
-
diff --git a/patches/dev300/upgrade-zlib-to-1.2.3.diff b/patches/dev300/upgrade-zlib-to-1.2.3.diff
deleted file mode 100644
index f078737..0000000
--- a/patches/dev300/upgrade-zlib-to-1.2.3.diff
+++ /dev/null
@@ -1,111 +0,0 @@
---- zlib/makefile.mk 2010-07-09 15:57:58.000000000 +0200
-+++ zlib/makefile.mk 2010-07-09 16:03:04.000000000 +0200
-@@ -44,10 +44,10 @@
-
- # --- Files --------------------------------------------------------
-
--TARFILE_NAME=zlib-1.1.4
--TARFILE_MD5=abc405d0bdd3ee22782d7aa20e440f08
-+TARFILE_NAME=zlib-1.2.3
-+TARFILE_MD5=debc62758716a169df9f62e6ab2bc634
-
--PATCH_FILES=zlib-1.1.4.patch
-+PATCH_FILES=zlib-1.2.3.patch
- ADDITIONAL_FILES=makefile.mk
-
- #relative to CONFIGURE_DIR
---- zlib/zlib-1.2.3.patch 1970-01-01 01:00:00.000000000 +0100
-+++ zlib/zlib-1.2.3.patch 2010-07-09 16:29:34.000000000 +0200
-@@ -0,0 +1,92 @@
-+--- misc/zlib-1.2.3/makefile.mk Fri Mar 14 10:17:06 2008
-++++ misc/build/zlib-1.2.3/makefile.mk Fri Mar 14 10:16:56 2008
-+@@ -1 +1,73 @@
-+-dummy
-++#*************************************************************************
-++#
-++# Copyright according the GNU Public License.
-++#
-++#*************************************************************************
-++
-++PRJ=..$/..$/..$/..
-++
-++PRJNAME=zlib
-++TARGET=zlib
-++LIBTARGET=NO
-++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-++
-++# --- Settings -----------------------------------------------------
-++
-++.INCLUDE : settings.mk
-++
-++# --- Files --------------------------------------------------------
-++
-++INCEXT=contrib$/minizip
-++
-++SLOFILES= $(SLO)$/adler32.obj \
-++ $(SLO)$/compress.obj \
-++ $(SLO)$/deflate.obj \
-++ $(SLO)$/crc32.obj \
-++ $(SLO)$/inffast.obj \
-++ $(SLO)$/inflate.obj \
-++ $(SLO)$/inftrees.obj \
-++ $(SLO)$/infback.obj \
-++ $(SLO)$/trees.obj \
-++ $(SLO)$/zutil.obj \
-++ $(SLO)$/uncompr.obj \
-++ $(SLO)$/gzio.obj \
-++ $(SLO)$/unzip.obj \
-++ $(SLO)$/ioapi.obj
-++
-++
-++LIB1TARGET=$(SLB)$/$(TARGET).lib
-++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-++LIB1OBJFILES=$(SLOFILES)
-++
-++.IF "$(BUILD_X64)"!=""
-++SLOFILES_X64= $(SLO_X64)$/adler32.obj \
-++ $(SLO_X64)$/compress.obj \
-++ $(SLO_X64)$/deflate.obj \
-++ $(SLO_X64)$/crc32.obj \
-++ $(SLO_X64)$/inffast.obj \
-++ $(SLO_X64)$/inflate.obj \
-++ $(SLO_X64)$/inftrees.obj \
-++ $(SLO_X64)$/infback.obj \
-++ $(SLO_X64)$/trees.obj \
-++ $(SLO_X64)$/zutil.obj \
-++ $(SLO_X64)$/uncompr.obj \
-++ $(SLO_X64)$/gzio.obj \
-++ $(SLO_X64)$/unzip.obj \
-++ $(SLO_X64)$/ioapi.obj
-++
-++LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
-++LIB1OBJFILES_X64=$(SLOFILES_X64)
-++.ENDIF # "$(BUILD_X64)"!=""
-++
-++
-++# --- Targets ------------------------------------------------------
-++
-++$(MISC)$/%.c : contrib$/minizip$/%.c
-++ @echo ------------------------------
-++ @echo Making: $@
-++ @$(COPY) $< $@
-++
-++.INCLUDE : set_wntx64.mk
-++.INCLUDE : target.mk
-++.INCLUDE : tg_wntx64.mk
-++
-+--- misc/zlib-1.2.3/zconf.h 2010-07-15 09:33:48.921875000 +0200
-++++ misc/build/zlib-1.2.3/zconf.h 2010-07-15 09:39:27.000000000 +0200
-+@@ -12,6 +12,12 @@
-+ * If you *really* need a unique prefix for all types and library functions,
-+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
-+ */
-++/*
-++ * we need the prefix to get the same names as in 1.1.3
-++*/
-++
-++#define Z_PREFIX
-++
-+ #ifdef Z_PREFIX
-+ # define deflateInit_ z_deflateInit_
-+ # define deflate z_deflate
diff --git a/patches/dev300/win32-avoid-uac.diff b/patches/dev300/win32-avoid-uac.diff
deleted file mode 100644
index 197b7d9..0000000
--- a/patches/dev300/win32-avoid-uac.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- solenv/bin/mhids.pl
-+++ solenv/bin/mhids.pl
-@@ -151,7 +151,11 @@
- $filebase =~ s/.*[\\\/]//;
- $filebase =~ s/\..*?$//;
- $workfile = "$tmpdir/${filebase}_".$$;
--#$workfile =~ s/setup/set_up/;
-+# Avoid UAC prompts on Windows
-+$workfile =~ s/setup/set_up/;
-+$workfile =~ s/patch/pat_ch/;
-+$workfile =~ s/update/up_date/;
-+$workfile =~ s/install/in_stall/;
-
- # now get $workfile ready for shell usage...
- $shell_workfile = $workfile;
diff --git a/patches/dev300/win32-boost-crack.diff b/patches/dev300/win32-boost-crack.diff
deleted file mode 100644
index 14ca99e..0000000
--- a/patches/dev300/win32-boost-crack.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- boost/boost_1_39_0.patch
-+++ boost/boost_1_39_0.patch
-@@ -181,3 +181,14 @@
- }
-
- template <typename ScannerT>
-+--- misc/build/boost_1_39_0/boost/bind/bind.hpp
-++++ misc/build/boost_1_39_0/boost/bind/bind.hpp
-+@@ -1628,7 +1628,7 @@
-+
-+ // data member pointers
-+
-+-#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
-++#if 1 || defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
-+ || ( defined(__BORLANDC__) && BOOST_WORKAROUND( __BORLANDC__, <= 0x610 ) )
-+
-+ template<class R, class T, class A1>
diff --git a/patches/dev300/win32-pdfimport-use-temporary-file.diff b/patches/dev300/win32-pdfimport-use-temporary-file.diff
deleted file mode 100644
index cb04a62..0000000
--- a/patches/dev300/win32-pdfimport-use-temporary-file.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- sdext/source/pdfimport/pdfiadaptor.cxx
-+++ sdext/source/pdfimport/pdfiadaptor.cxx
-@@ -254,7 +254,7 @@
-
- bool bSuccess=false;
-
-- if( xInput.is() && (!rURL.getLength() || rURL.compareToAscii( "file:", 5 ) != 0) )
-+ if( xInput.is() )
- bSuccess = xpdf_ImportFromStream( xInput, pSink, xIHdl, rPwd, m_xContext );
- else
- bSuccess = xpdf_ImportFromFile( rURL, pSink, xIHdl, rPwd, m_xContext );
---- sdext/source/pdfimport/wrapper/wrapper.cxx
-+++ sdext/source/pdfimport/wrapper/wrapper.cxx
-@@ -1041,7 +1041,11 @@
-
- osl_closeFile( aFile );
-
-- return bSuccess && xpdf_ImportFromFile( aURL, rSink, xIHdl, rPwd, xContext );
-+ if ( bSuccess )
-+ bSuccess = xpdf_ImportFromFile( aURL, rSink, xIHdl, rPwd, xContext );
-+ osl_removeFile( aURL.pData );
-+
-+ return bSuccess;
- }
-
- }
diff --git a/patches/dev300/wpgimporter.diff b/patches/dev300/wpgimporter.diff
deleted file mode 100644
index d8e3b4a..0000000
--- a/patches/dev300/wpgimporter.diff
+++ /dev/null
@@ -1,1439 +0,0 @@
----
- configure.in | 21 +
- filter/source/config/fragments/fcfg_draw.mk | 7 +-
- .../fragments/filters/WordPerfectGraphics.xcu | 13 +
- .../fragments/types/draw_WordPerfect_Graphics.xcu | 12 +
- scp2/source/graphicfilter/file_graphicfilter.scp | 1 +
- scp2/source/graphicfilter/module_graphicfilter.scp | 2 +-
- set_soenv.in | 3 +
- writerperfect/prj/build.lst | 5 +-
- writerperfect/source/filter/DocumentHandler.cxx | 2 +-
- writerperfect/source/wpgimp/OdgExporter.cxx | 510 ++++++++++++++++++++
- writerperfect/source/wpgimp/OdgExporter.hxx | 78 +++
- writerperfect/source/wpgimp/WPGImportFilter.cxx | 331 +++++++++++++
- writerperfect/source/wpgimp/WPGImportFilter.hxx | 128 +++++
- writerperfect/source/wpgimp/makefile.mk | 35 ++
- .../source/wpgimp/wpgimport_genericfilter.cxx | 101 ++++
- writerperfect/util/makefile.mk | 35 ++
- 16 files changed, 1278 insertions(+), 6 deletions(-)
- create mode 100644 filter/source/config/fragments/filters/WordPerfectGraphics.xcu
- create mode 100644 filter/source/config/fragments/types/draw_WordPerfect_Graphics.xcu
- create mode 100644 writerperfect/source/wpgimp/OdgExporter.cxx
- create mode 100644 writerperfect/source/wpgimp/OdgExporter.hxx
- create mode 100644 writerperfect/source/wpgimp/WPGImportFilter.cxx
- create mode 100644 writerperfect/source/wpgimp/WPGImportFilter.hxx
- create mode 100644 writerperfect/source/wpgimp/makefile.mk
- create mode 100644 writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
-
-diff --git configure.in configure.in
-index a062c42..05704cb 100644
---- configure.in
-+++ configure.in
-@@ -346,6 +346,9 @@ AC_ARG_WITH(system-libwpd,
- AC_ARG_WITH(system-libwps,
- [ --with-system-libwps Use libwps already on system
- ],,)
-+AC_ARG_WITH(system-libwpg,
-+[ --with-system-libwpg Use libwpg already on system
-+],,)
- AC_ARG_WITH(system-libxml,
- [ --with-system-libxml Use libxml already on system
- ],,)
-@@ -3665,6 +3668,24 @@ AC_SUBST(LIBWPS_CFLAGS)
- AC_SUBST(LIBWPS_LIBS)
-
- dnl ===================================================================
-+dnl Check for system libwpg
-+dnl ===================================================================
-+AC_MSG_CHECKING([which libwpg to use])
-+if test -n "$with_system_libwpg" -o -n "$with_system_libs" && \
-+ test "$with_system_libwpg" != "no"; then
-+ AC_MSG_RESULT([external])
-+ SYSTEM_LIBWPG=YES
-+ PKG_CHECK_MODULES( LIBWPG, libwpg-0.1 )
-+else
-+ AC_MSG_RESULT([internal])
-+ SYSTEM_LIBWPG=NO
-+ BUILD_TYPE="$BUILD_TYPE LIBWPG"
-+fi
-+AC_SUBST(SYSTEM_LIBWPG)
-+AC_SUBST(LIBWPG_CFLAGS)
-+AC_SUBST(LIBWPG_LIBS)
-+
-+dnl ===================================================================
- dnl Check whether freetype2 supports emboldening
- dnl ===================================================================
- if test "$test_freetype" = "yes"; then
-diff --git filter/source/config/fragments/fcfg_draw.mk filter/source/config/fragments/fcfg_draw.mk
-index d6e6d9c..71d6b0b 100644
---- filter/source/config/fragments/fcfg_draw.mk
-+++ filter/source/config/fragments/fcfg_draw.mk
-@@ -7,7 +7,8 @@ T4_DRAW = \
- draw_StarOffice_XML_Draw_Template \
- pdf_Portable_Document_Format\
- draw8 \
-- draw8_template
-+ draw8_template \
-+ draw_WordPerfect_Graphics
-
- # -----------------------------------------------
- # count = 9
-@@ -16,7 +17,9 @@ F4_DRAW = \
- draw_StarOffice_XML_Draw_Template \
- draw_pdf_Export \
- draw8 \
-- draw8_template
-+ draw8_template \
-+ WordPerfectGraphics
-+
-
- # -----------------------------------------------
- # count = 4
-diff --git filter/source/config/fragments/filters/WordPerfectGraphics.xcu filter/source/config/fragments/filters/WordPerfectGraphics.xcu
-new file mode 100644
-index 0000000..9e5d002
---- /dev/null
-+++ filter/source/config/fragments/filters/WordPerfectGraphics.xcu
-@@ -0,0 +1,13 @@
-+ <node oor:name="WordPerfect Graphics" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.WPGImportFilter</value></prop>
-+ <prop oor:name="UserData"><value></value></prop>
-+ <prop oor:name="UIName">
-+ <value xml:lang="x-default">WordPerfect Graphics</value>
-+ </prop>
-+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
-+ <prop oor:name="Type"><value>draw_WordPerfect_Graphics</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
-+ </node>
-diff --git filter/source/config/fragments/types/draw_WordPerfect_Graphics.xcu filter/source/config/fragments/types/draw_WordPerfect_Graphics.xcu
-new file mode 100644
-index 0000000..4968294
---- /dev/null
-+++ filter/source/config/fragments/types/draw_WordPerfect_Graphics.xcu
-@@ -0,0 +1,12 @@
-+ <node oor:name="draw_WordPerfect_Graphics" oor:op="replace" >
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.WPGImportFilter</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>wpg</value></prop>
-+ <prop oor:name="MediaType"><value>image/x-wpg</value></prop>
-+ <prop oor:name="Preferred"><value>true</value></prop>
-+ <prop oor:name="PreferredFilter"><value>WordPerfect Graphics</value></prop>
-+ <prop oor:name="UIName">
-+ <value>WordPerfect Graphics</value>
-+ </prop>
-+ <prop oor:name="ClipboardFormat"/>
-+ </node>
-diff --git scp2/source/graphicfilter/file_graphicfilter.scp scp2/source/graphicfilter/file_graphicfilter.scp
-index 2cd0f53..4ba30a6 100644
---- scp2/source/graphicfilter/file_graphicfilter.scp
-+++ scp2/source/graphicfilter/file_graphicfilter.scp
-@@ -38,3 +38,4 @@ STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash )
-
- STD_UNO_LIB_FILE( gid_File_Lib_Svg, svgfilter )
-
-+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_WPGImport, wpgimport )
-diff --git scp2/source/graphicfilter/module_graphicfilter.scp scp2/source/graphicfilter/module_graphicfilter.scp
-index d5d9996..5b6dffb 100644
---- scp2/source/graphicfilter/module_graphicfilter.scp
-+++ scp2/source/graphicfilter/module_graphicfilter.scp
-@@ -33,6 +33,6 @@ Module gid_Module_Optional_Grfflt
- Sortkey = "600";
- ParentID = gid_Module_Optional;
- Default = YES;
-- Files = (gid_File_Lib_Svg, gid_File_Lib_Flash,
-+ Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
- gid_File_Share_Registry_Graphicfilter_Xcd);
- End
-diff --git set_soenv.in set_soenv.in
-index 94a3cd9..4d83375 100644
---- set_soenv.in
-+++ set_soenv.in
-@@ -1862,6 +1862,9 @@ ToFile( "LIBWPD_LIBS", "@LIBWPD_LIBS@", "e" );
- ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" );
- ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" );
- ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" );
-+ToFile( "SYSTEM_LIBWPG", "@SYSTEM_LIBWPG@", "e" );
-+ToFile( "LIBWPG_CFLAGS", "@LIBWPG_CFLAGS@", "e" );
-+ToFile( "LIBWPG_LIBS", "@LIBWPG_LIBS@", "e" );
- ToFile( "SYSTEM_CPPUNIT", "@SYSTEM_CPPUNIT@", "e" );
- ToFile( "CPPUNIT_CFLAGS", "@CPPUNIT_CFLAGS@", "e" );
- ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" );
-diff --git writerperfect/prj/build.lst writerperfect/prj/build.lst
-index d708c33..bf7a656 100644
---- writerperfect/prj/build.lst
-+++ writerperfect/prj/build.lst
-@@ -1,7 +1,8 @@
--wp writerperfect : LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools NULL
-+wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools 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
- wp writerperfect\source\wpdimp nmake - all wp_wpdimp NULL
- wp writerperfect\source\wpsimp nmake - all wp_wpsimp NULL
--wp writerperfect\util nmake - all wp_util wp_wpsimp wp_wpdimp wp_filter wp_stream NULL
-+wp writerperfect\source\wpgimp nmake - all wp_wpgimp NULL
-+wp writerperfect\util nmake - all wp_util wp_wpgimp wp_wpsimp wp_wpdimp wp_filter wp_stream NULL
-diff --git writerperfect/source/filter/DocumentHandler.cxx writerperfect/source/filter/DocumentHandler.cxx
-index 2af504c..17dcba3 100644
---- writerperfect/source/filter/DocumentHandler.cxx
-+++ writerperfect/source/filter/DocumentHandler.cxx
-@@ -61,7 +61,7 @@ void DocumentHandler::startElement(const char *psName, const WPXPropertyList &xP
- for (i.rewind(); i.next(); )
- {
- // filter out libwpd elements
-- if (strlen(i.key()) > 6 && strncmp(i.key(), "libwpd", 6) != 0)
-+ if (strncmp(i.key(), "libwpd", 6) != 0)
- pAttrList->AddAttribute(OUString::createFromAscii(i.key()),
- OUString::createFromAscii(i()->getStr().cstr()));
- }
-diff --git writerperfect/source/wpgimp/OdgExporter.cxx writerperfect/source/wpgimp/OdgExporter.cxx
-new file mode 100644
-index 0000000..d87ce08
---- /dev/null
-+++ writerperfect/source/wpgimp/OdgExporter.cxx
-@@ -0,0 +1,510 @@
-+/* libwpg
-+ * Copyright (C) 2006 Ariya Hidayat (ariya at kde.org)
-+ * Copyright (C) 2006-2007 Fridrich Strba (fridrich.strba at bluewin.ch)
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02111-1301 USA
-+ *
-+ * For further information visit http://libwpg.sourceforge.net
-+ */
-+
-+/* "This product is not manufactured, approved, or supported by
-+ * Corel Corporation or Corel Corporation Limited."
-+ */
-+
-+#include "OdgExporter.hxx"
-+#include "filter/DocumentElement.hxx"
-+#include "filter/DocumentHandler.hxx"
-+#include <rtl/math.hxx>
-+
-+
-+OdgExporter::OdgExporter(DocumentHandler *pHandler):
-+ mpHandler(pHandler),
-+ m_fillRule(AlternatingFill),
-+ m_gradientIndex(1),
-+ m_dashIndex(1),
-+ m_styleIndex(1)
-+{
-+}
-+
-+OdgExporter::~OdgExporter()
-+{
-+}
-+
-+void OdgExporter::startDocument(double width, double height)
-+{
-+ m_gradientIndex = 1;
-+ m_dashIndex = 1;
-+ m_styleIndex = 1;
-+
-+ mpHandler->startDocument();
-+ TagOpenElement tmpOfficeDocumentContent("office:document");
-+ tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
-+ tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
-+ tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
-+ tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
-+ tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
-+ tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
-+ tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
-+ tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
-+ tmpOfficeDocumentContent.write(mpHandler);
-+
-+ TagOpenElement("office:styles").write(mpHandler);
-+ TagCloseElement("office:styles").write(mpHandler);
-+
-+ TagOpenElement("office:automatic-styles").write(mpHandler);
-+
-+ TagOpenElement tmpStylePageLayoutOpenElement("style:page-layout");
-+ tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
-+ tmpStylePageLayoutOpenElement.write(mpHandler);
-+
-+ TagOpenElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
-+ tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0cm");
-+ tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0cm");
-+ tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0cm");
-+ tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0cm");
-+ WPXString sValue;
-+ sValue = doubleToString(2.54 * width); sValue.append("cm");
-+ tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", sValue);
-+ sValue = doubleToString(2.54 * height); sValue.append("cm");
-+ tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", sValue);
-+ tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
-+ tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
-+
-+ TagCloseElement("style:page-layout-properties").write(mpHandler);
-+
-+ TagCloseElement("style:page-layout").write(mpHandler);
-+
-+ TagOpenElement tmpStyleStyleOpenElement("style:style");
-+ tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
-+ tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
-+ tmpStyleStyleOpenElement.write(mpHandler);
-+
-+ TagOpenElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
-+ tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
-+ tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
-+ tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
-+
-+ TagCloseElement("style:drawing-page-properties").write(mpHandler);
-+
-+ TagCloseElement("style:style").write(mpHandler);
-+}
-+
-+void OdgExporter::endDocument()
-+{
-+ TagCloseElement("office:automatic-styles").write(mpHandler);
-+
-+ TagOpenElement("office:master-styles").write(mpHandler);
-+
-+ TagOpenElement tmpStyleMasterPageOpenElement("style:master-page");
-+ tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
-+ tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
-+ tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
-+ tmpStyleMasterPageOpenElement.write(mpHandler);
-+
-+ TagCloseElement("style:master-page").write(mpHandler);
-+
-+ TagCloseElement("office:master-styles").write(mpHandler);
-+
-+ TagOpenElement("office:body").write(mpHandler);
-+
-+ TagOpenElement("office:drawing").write(mpHandler);
-+
-+ TagOpenElement tmpDrawPageOpenElement("draw:page");
-+ tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
-+ tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
-+ tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
-+ tmpDrawPageOpenElement.write(mpHandler);
-+
-+ for (std::vector<DocumentElement *>::const_iterator bodyIter = mpBodyElements.begin();
-+ bodyIter != mpBodyElements.end(); bodyIter++)
-+ {
-+ (*bodyIter)->write(mpHandler);
-+ }
-+
-+ TagCloseElement("draw:page").write(mpHandler);
-+ TagCloseElement("office:drawing").write(mpHandler);
-+ TagCloseElement("office:body").write(mpHandler);
-+ TagCloseElement("office:document").write(mpHandler);
-+
-+ mpHandler->endDocument();
-+}
-+
-+void OdgExporter::setPen(const libwpg::WPGPen& pen)
-+{
-+ m_pen = pen;
-+}
-+
-+void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
-+{
-+ m_brush = brush;
-+}
-+
-+void OdgExporter::setFillRule(FillRule rule)
-+{
-+ m_fillRule = rule;
-+}
-+
-+void OdgExporter::startLayer(unsigned int /* id */)
-+{
-+}
-+
-+void OdgExporter::endLayer(unsigned int)
-+{
-+}
-+
-+void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double /* ry */)
-+{
-+ writeStyle();
-+ TagOpenElement *pDrawRectElement = new TagOpenElement("draw:rect");
-+ WPXString sValue;
-+ sValue.sprintf("gr%i", m_styleIndex-1);
-+ pDrawRectElement->addAttribute("draw:style-name", sValue);
-+ sValue = doubleToString(2.54 * rect.x1); sValue.append("cm");
-+ pDrawRectElement->addAttribute("svg:x", sValue);
-+ sValue = doubleToString(2.54 * rect.y1); sValue.append("cm");
-+ pDrawRectElement->addAttribute("svg:y", sValue);
-+ sValue = doubleToString(2.54 * (rect.x2-rect.x1)); sValue.append("cm");
-+ pDrawRectElement->addAttribute("svg:width", sValue);
-+ sValue = doubleToString(2.54 * (rect.y2-rect.y1)); sValue.append("cm");
-+ pDrawRectElement->addAttribute("svg:height", sValue);
-+ sValue = doubleToString(2.54 * rx); sValue.append("cm");
-+ // FIXME: what to do when rx != ry ?
-+ pDrawRectElement->addAttribute("draw:corner-radius", sValue);
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawRectElement));
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:rect")));
-+}
-+
-+void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
-+{
-+ writeStyle();
-+ TagOpenElement *pDrawEllipseElement = new TagOpenElement("draw:ellipse");
-+ WPXString sValue;
-+ sValue.sprintf("gr%i", m_styleIndex-1);
-+ pDrawEllipseElement->addAttribute("draw:style-name", sValue);
-+ sValue = doubleToString(2.54 * (center.x-rx)); sValue.append("cm");
-+ pDrawEllipseElement->addAttribute("svg:x", sValue);
-+ sValue = doubleToString(2.54 * (center.y-ry)); sValue.append("cm");
-+ pDrawEllipseElement->addAttribute("svg:y", sValue);
-+ sValue = doubleToString(2 * 2.54 * rx); sValue.append("cm");
-+ pDrawEllipseElement->addAttribute("svg:width", sValue);
-+ sValue = doubleToString(2 * 2.54 * ry); sValue.append("cm");
-+ pDrawEllipseElement->addAttribute("svg:height", sValue);
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawEllipseElement));
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:ellipse")));
-+}
-+
-+void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
-+{
-+ if(vertices.count() < 2)
-+ return;
-+
-+ if(vertices.count() == 2)
-+ {
-+ const libwpg::WPGPoint& p1 = vertices[0];
-+ const libwpg::WPGPoint& p2 = vertices[1];
-+
-+ writeStyle();
-+ TagOpenElement *pDrawLineElement = new TagOpenElement("draw:line");
-+ WPXString sValue;
-+ sValue.sprintf("gr%i", m_styleIndex-1);
-+ pDrawLineElement->addAttribute("draw:style-name", sValue);
-+ pDrawLineElement->addAttribute("draw:text-style-name", "P1");
-+ pDrawLineElement->addAttribute("draw:layer", "layout");
-+ sValue = doubleToString(2.54 * p1.x); sValue.append("cm");
-+ pDrawLineElement->addAttribute("svg:x1", sValue);
-+ sValue = doubleToString(2.54 * p1.y); sValue.append("cm");
-+ pDrawLineElement->addAttribute("svg:y1", sValue);
-+ sValue = doubleToString(2.54 * p2.x); sValue.append("cm");
-+ pDrawLineElement->addAttribute("svg:x2", sValue);
-+ sValue = doubleToString(2.54 * p2.y); sValue.append("cm");
-+ pDrawLineElement->addAttribute("svg:y2", sValue);
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawLineElement));
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:line")));
-+ }
-+ else
-+ {
-+ // draw as path
-+ libwpg::WPGPath path;
-+ path.moveTo(vertices[0]);
-+ for(unsigned long ii = 1; ii < vertices.count(); ii++)
-+ path.lineTo(vertices[ii]);
-+ path.closed = true;
-+ drawPath(path);
-+ }
-+}
-+
-+void OdgExporter::drawPath(const libwpg::WPGPath& path)
-+{
-+ if(path.count() == 0)
-+ return;
-+
-+ // try to find the bounding box
-+ // this is simple convex hull technique, the bounding box might not be
-+ // accurate but that should be enough for this purpose
-+ libwpg::WPGPoint p = path.element(0).point;
-+ libwpg::WPGPoint q = path.element(0).point;
-+ for(unsigned k = 0; k < path.count(); k++)
-+ {
-+ libwpg::WPGPathElement element = path.element(k);
-+ p.x = (p.x > element.point.x) ? element.point.x : p.x;
-+ p.y = (p.y > element.point.y) ? element.point.y : p.y;
-+ q.x = (q.x < element.point.x) ? element.point.x : q.x;
-+ q.y = (q.y < element.point.y) ? element.point.y : q.y;
-+ if(element.type == libwpg::WPGPathElement::CurveToElement)
-+ {
-+ p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
-+ p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
-+ q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
-+ q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
-+ p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
-+ p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
-+ q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
-+ q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
-+ }
-+ }
-+ double vw = q.x - p.x;
-+ double vh = q.y - p.y;
-+
-+ writeStyle();
-+
-+ TagOpenElement *pDrawPathElement = new TagOpenElement("draw:path");
-+ WPXString sValue;
-+ sValue.sprintf("gr%i", m_styleIndex-1);
-+ pDrawPathElement->addAttribute("draw:style-name", sValue);
-+ pDrawPathElement->addAttribute("draw:text-style-name", "P1");
-+ pDrawPathElement->addAttribute("draw:layer", "layout");
-+ sValue = doubleToString(2.54 * p.x); sValue.append("cm");
-+ pDrawPathElement->addAttribute("svg:x", sValue);
-+ sValue = doubleToString(2.54 * p.y); sValue.append("cm");
-+ pDrawPathElement->addAttribute("svg:y", sValue);
-+ sValue = doubleToString(2.54 * vw); sValue.append("cm");
-+ pDrawPathElement->addAttribute("svg:width", sValue);
-+ sValue = doubleToString(2.54 * vh); sValue.append("cm");
-+ pDrawPathElement->addAttribute("svg:height", sValue);
-+ sValue.sprintf("%i %i %i %i", 0, 0, (int)(vw*2540), (int)(vh*2540));
-+ pDrawPathElement->addAttribute("svg:viewBox", sValue);
-+
-+ sValue.clear();
-+ for(unsigned i = 0; i < path.count(); i++)
-+ {
-+ libwpg::WPGPathElement element = path.element(i);
-+ libwpg::WPGPoint point = element.point;
-+ WPXString sElement;
-+ switch(element.type)
-+ {
-+ // 2540 is 2.54*1000, 2.54 cm = 1 inch
-+ case libwpg::WPGPathElement::MoveToElement:
-+ sElement.sprintf("M%i %i", (int)((point.x-p.x)*2540), (int)((point.y-p.y)*2540));
-+ break;
-+
-+ case libwpg::WPGPathElement::LineToElement:
-+ sElement.sprintf("L%i %i", (int)((point.x-p.x)*2540), (int)((point.y-p.y)*2540));
-+ break;
-+
-+ case libwpg::WPGPathElement::CurveToElement:
-+ sElement.sprintf("C%i %i %i %i %i %i", (int)((element.extra1.x-p.x)*2540),
-+ (int)((element.extra1.y-p.y)*2540), (int)((element.extra2.x-p.x)*2540),
-+ (int)((element.extra2.y-p.y)*2540), (int)((point.x-p.x)*2540), (int)((point.y-p.y)*2540));
-+ break;
-+
-+ default:
-+ break;
-+ }
-+ sValue.append(sElement);
-+ }
-+ if(path.closed)
-+ sValue.append(" Z");
-+ pDrawPathElement->addAttribute("svg:d", sValue);
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawPathElement));
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:path")));
-+}
-+
-+void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
-+{
-+ TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame");
-+ WPXString sValue;
-+ sValue = doubleToString(2.54 * bitmap.rect.x1); sValue.append("cm");
-+ pDrawFrameElement->addAttribute("svg:x", sValue);
-+ sValue = doubleToString(2.54 * bitmap.rect.y1); sValue.append("cm");
-+ pDrawFrameElement->addAttribute("svg:y", sValue);
-+ sValue = doubleToString(2.54 * bitmap.rect.height()); sValue.append("cm");
-+ pDrawFrameElement->addAttribute("svg:height", sValue);
-+ sValue = doubleToString(2.54 * bitmap.rect.width()); sValue.append("cm");
-+ pDrawFrameElement->addAttribute("svg:width", sValue);
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawFrameElement));
-+
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagOpenElement("draw:image")));
-+
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagOpenElement("office:binary-data")));
-+
-+ libwpg::WPGString base64Binary;
-+ bitmap.generateBase64DIB(base64Binary);
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new CharDataElement(base64Binary.cstr())));
-+
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("office:binary-data")));
-+
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:image")));
-+
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:frame")));
-+}
-+
-+void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
-+{
-+ if (binaryData.mimeType.length() <= 0)
-+ return;
-+
-+ TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame");
-+ WPXString sValue;
-+ sValue = doubleToString(2.54 * binaryData.rect.x1); sValue.append("cm");
-+ pDrawFrameElement->addAttribute("svg:x", sValue);
-+ sValue = doubleToString(2.54 * binaryData.rect.y1); sValue.append("cm");
-+ pDrawFrameElement->addAttribute("svg:y", sValue);
-+ sValue = doubleToString(2.54 * binaryData.rect.height()); sValue.append("cm");
-+ pDrawFrameElement->addAttribute("svg:height", sValue);
-+ sValue = doubleToString(2.54 * binaryData.rect.width()); sValue.append("cm");
-+ pDrawFrameElement->addAttribute("svg:width", sValue);
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawFrameElement));
-+
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagOpenElement("draw:image")));
-+
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagOpenElement("office:binary-data")));
-+
-+ libwpg::WPGString base64Binary = binaryData.getBase64Data();;
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new CharDataElement(base64Binary.cstr())));
-+
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("office:binary-data")));
-+
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:image")));
-+
-+ mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:frame")));
-+}
-+
-+void OdgExporter::writeStyle()
-+{
-+ if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
-+ {
-+ // ODG only supports dashes with the same length of spaces inbetween
-+ // here we take the first space and assume everything else the same
-+ // note that dash length is written in percentage
-+ double distance = m_pen.dashArray.at(1);
-+ TagOpenElement tmpDrawStrokeDashElement("draw:stroke-dash");
-+ tmpDrawStrokeDashElement.addAttribute("draw:style", "rect");
-+ WPXString sValue;
-+ sValue.sprintf("Dash_%i", m_dashIndex++);
-+ tmpDrawStrokeDashElement.addAttribute("draw:name", sValue);
-+ sValue.sprintf("%i \%", distance*100);
-+ tmpDrawStrokeDashElement.addAttribute("draw:distance", sValue);
-+ WPXString sName;
-+ for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
-+ {
-+ sName.sprintf("draw:dots%i", i+1);
-+ tmpDrawStrokeDashElement.addAttribute(sName.cstr(), "1");
-+ sName.sprintf("draw:dots%i-length", i+1);
-+ sValue.sprintf("%i\%", 100*m_pen.dashArray.at(i*2));
-+ tmpDrawStrokeDashElement.addAttribute(sName.cstr(), sValue);
-+ }
-+ tmpDrawStrokeDashElement.write(mpHandler);
-+ TagCloseElement("draw:stroke-dash").write(mpHandler);
-+ }
-+
-+ if(m_brush.style == libwpg::WPGBrush::Gradient)
-+ {
-+ TagOpenElement tmpDrawGradientElement("draw:gradient");
-+ tmpDrawGradientElement.addAttribute("draw:style", "linear");
-+ WPXString sValue;
-+ sValue.sprintf("Gradient_%i", m_gradientIndex++);
-+ tmpDrawGradientElement.addAttribute("draw:name", sValue);
-+
-+ // ODG angle unit is 0.1 degree
-+ double angle = -m_brush.gradient.angle();
-+ while(angle < 0)
-+ angle += 360;
-+ while(angle > 360)
-+ angle -= 360;
-+
-+ sValue.sprintf("%i", angle*10);
-+ tmpDrawGradientElement.addAttribute("draw:angle", sValue);
-+
-+ libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
-+ libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
-+ sValue.sprintf("#%.2x%.2x%.2x", (startColor.red & 0xff), (startColor.green & 0xff), (startColor.blue & 0xff));
-+ tmpDrawGradientElement.addAttribute("draw:start-color", sValue);
-+ sValue.sprintf("#%.2x%.2x%.2x", (stopColor.red & 0xff), (stopColor.green & 0xff), (stopColor.blue & 0xff));
-+ tmpDrawGradientElement.addAttribute("draw:end-color", sValue);
-+ tmpDrawGradientElement.addAttribute("draw:start-intensity", "100%");
-+ tmpDrawGradientElement.addAttribute("draw:end-intensity", "100%");
-+ tmpDrawGradientElement.addAttribute("draw:border", "0%");
-+ tmpDrawGradientElement.write(mpHandler);
-+ TagCloseElement("draw:gradient").write(mpHandler);
-+ }
-+
-+ TagOpenElement tmpStyleStyleElement("style:style");
-+ WPXString sValue;
-+ sValue.sprintf("gr%i", m_styleIndex);
-+ tmpStyleStyleElement.addAttribute("style:name", sValue);
-+ tmpStyleStyleElement.addAttribute("style:family", "graphic");
-+ tmpStyleStyleElement.addAttribute("style:parent-style-name", "standard");
-+ tmpStyleStyleElement.write(mpHandler);
-+
-+ TagOpenElement tmpStyleGraphicPropertiesElement("style:graphic-properties");
-+
-+ if(m_pen.width > 0.0)
-+ {
-+ sValue = doubleToString(2.54 * m_pen.width); sValue.append("cm");
-+ tmpStyleGraphicPropertiesElement.addAttribute("svg:stroke-width", sValue);
-+ sValue.sprintf("#%.2x%.2x%.2x", (m_pen.foreColor.red & 0xff),
-+ (m_pen.foreColor.green & 0xff), (m_pen.foreColor.blue & 0xff));
-+ tmpStyleGraphicPropertiesElement.addAttribute("svg:stroke-color", sValue);
-+
-+ if(!m_pen.solid)
-+ {
-+ tmpStyleGraphicPropertiesElement.addAttribute("draw:stroke", "dash");
-+ sValue.sprintf("Dash_%i", m_dashIndex-1);
-+ tmpStyleGraphicPropertiesElement.addAttribute("draw:stroke-dash", sValue);
-+ }
-+ }
-+ else
-+ tmpStyleGraphicPropertiesElement.addAttribute("draw:stroke", "none");
-+
-+ if(m_brush.style == libwpg::WPGBrush::NoBrush)
-+ tmpStyleGraphicPropertiesElement.addAttribute("draw:fill", "none");
-+
-+ if(m_brush.style == libwpg::WPGBrush::Solid)
-+ {
-+ tmpStyleGraphicPropertiesElement.addAttribute("draw:fill", "solid");
-+ sValue.sprintf("#%.2x%.2x%.2x", (m_brush.foreColor.red & 0xff),
-+ (m_brush.foreColor.green & 0xff), (m_brush.foreColor.blue & 0xff));
-+ tmpStyleGraphicPropertiesElement.addAttribute("draw:fill-color", sValue);
-+ }
-+
-+ if(m_brush.style == libwpg::WPGBrush::Gradient)
-+ {
-+ tmpStyleGraphicPropertiesElement.addAttribute("draw:fill", "gradient");
-+ sValue.sprintf("Gradient_%i", m_gradientIndex-1);
-+ tmpStyleGraphicPropertiesElement.addAttribute("draw:fill-gradient-name", sValue);
-+ }
-+
-+ tmpStyleGraphicPropertiesElement.write(mpHandler);
-+ TagCloseElement("style:graphic-properties").write(mpHandler);
-+
-+ TagCloseElement("style:style").write(mpHandler);
-+ m_styleIndex++;
-+}
-+
-+WPXString OdgExporter::doubleToString(const double value)
-+{
-+ return WPXString((char *)::rtl::math::doubleToString(value, rtl_math_StringFormat_F, 4, '.').getStr());
-+}
-diff --git writerperfect/source/wpgimp/OdgExporter.hxx writerperfect/source/wpgimp/OdgExporter.hxx
-new file mode 100644
-index 0000000..881acb4
---- /dev/null
-+++ writerperfect/source/wpgimp/OdgExporter.hxx
-@@ -0,0 +1,78 @@
-+/* libwpg
-+ * Copyright (C) 2006 Ariya Hidayat (ariya at kde.org)
-+ * Copyright (C) 2007 Fridrich Strba (fridrich_strba at bluewin.ch)
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02111-1301 USA
-+ *
-+ * For further information visit http://libwpg.sourceforge.net
-+ */
-+
-+/* "This product is not manufactured, approved, or supported by
-+ * Corel Corporation or Corel Corporation Limited."
-+ */
-+
-+#ifndef __ODGEXPORTER_HXX__
-+#define __ODGEXPORTER_HXX__
-+
-+#include <iostream>
-+#include <sstream>
-+#include <string>
-+
-+#include <libwpd/WPXString.h>
-+#include <libwpg/libwpg.h>
-+#include <libwpg/WPGBinaryData.h>
-+#include "filter/DocumentElement.hxx"
-+#include "filter/DocumentHandler.hxx"
-+
-+class OdgExporter : public libwpg::WPGPaintInterface {
-+public:
-+ OdgExporter(DocumentHandler *pHandler);
-+ ~OdgExporter();
-+
-+ void startDocument(double width, double height);
-+ void startGraphics(double width, double height) { startDocument(width, height); }
-+ void endDocument();
-+ void endGraphics() { endDocument(); };
-+ void startLayer(unsigned int id);
-+ void endLayer(unsigned int id);
-+
-+ 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 drawPolygon(const libwpg::WPGPointArray& vertices);
-+ void drawPath(const libwpg::WPGPath& path);
-+ void drawBitmap(const libwpg::WPGBitmap& bitmap);
-+ void drawImageObject(const libwpg::WPGBinaryData& binaryData);
-+
-+private:
-+ std::vector <DocumentElement *> mpBodyElements;
-+ std::vector <DocumentElement *> mpStylesElements;
-+ DocumentHandler *mpHandler;
-+
-+ libwpg::WPGPen m_pen;
-+ libwpg::WPGBrush m_brush;
-+ FillRule m_fillRule;
-+ int m_gradientIndex;
-+ int m_dashIndex;
-+ int m_styleIndex;
-+ void writeStyle();
-+ WPXString doubleToString(const double value);
-+};
-+
-+#endif // __ODGEXPORTER_HXX__
-diff --git writerperfect/source/wpgimp/WPGImportFilter.cxx writerperfect/source/wpgimp/WPGImportFilter.cxx
-new file mode 100644
-index 0000000..0ac0f80
---- /dev/null
-+++ writerperfect/source/wpgimp/WPGImportFilter.cxx
-@@ -0,0 +1,302 @@
-+/* WPGImportFilter: Sets up the filter, and calls OdgExporter
-+ * to do the actual filtering
-+ *
-+ * Copyright (C) 2000 by Sun Microsystems, Inc.
-+ * Copyright (C) 2002-2004 William Lachance (wlach at interlog.com)
-+ * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
-+ * Copyright (C) 2004-2006 Fridrich Strba <fridrich.strba at bluewin.ch>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ *
-+ * Contributor(s): Martin Gallwey (gallwey at sun.com)
-+ *
-+ */
-+
-+/* "This product is not manufactured, approved, or supported by
-+ * Corel Corporation or Corel Corporation Limited."
-+ */
-+
-+#include <osl/diagnose.h>
-+#include <rtl/tencinfo.h>
-+
-+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#include <com/sun/star/io/XInputStream.hpp>
-+#include <com/sun/star/xml/sax/XAttributeList.hpp>
-+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-+#include <com/sun/star/xml/sax/InputSource.hpp>
-+#include <com/sun/star/xml/sax/XParser.hpp>
-+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#include <com/sun/star/io/XInputStream.hpp>
-+#include <com/sun/star/io/XSeekable.hpp>
-+#include <com/sun/star/uno/Reference.h>
-+
-+#include <xmloff/attrlist.hxx>
-+
-+#include "filter/DocumentHandler.hxx"
-+#include "OdgExporter.hxx"
-+#include "WPGImportFilter.hxx"
-+#include "stream/WPXSvStream.h"
-+
-+#include <iostream>
-+
-+using namespace ::com::sun::star::uno;
-+using com::sun::star::uno::Reference;
-+using com::sun::star::io::XInputStream;
-+using com::sun::star::io::XSeekable;
-+using com::sun::star::uno::Sequence;
-+using namespace ::rtl;
-+using rtl::OString;
-+using rtl::OUString;
-+using com::sun::star::uno::Sequence;
-+using com::sun::star::uno::Reference;
-+using com::sun::star::uno::Any;
-+using com::sun::star::uno::UNO_QUERY;
-+using com::sun::star::uno::XInterface;
-+using com::sun::star::uno::Exception;
-+using com::sun::star::uno::RuntimeException;
-+using com::sun::star::lang::XMultiServiceFactory;
-+using com::sun::star::beans::PropertyValue;
-+using com::sun::star::document::XFilter;
-+using com::sun::star::document::XExtendedFilterDetection;
-+
-+using com::sun::star::io::XInputStream;
-+using com::sun::star::document::XImporter;
-+using com::sun::star::xml::sax::InputSource;
-+using com::sun::star::xml::sax::XAttributeList;
-+using com::sun::star::xml::sax::XDocumentHandler;
-+using com::sun::star::xml::sax::XParser;
-+
-+
-+sal_Bool SAL_CALL WPGImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-+ throw (RuntimeException)
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter::filter" << std::endl;
-+#endif
-+ sal_Int32 nLength = aDescriptor.getLength();
-+ const PropertyValue * pValue = aDescriptor.getConstArray();
-+ OUString sURL;
-+ Reference < XInputStream > xInputStream;
-+ for ( sal_Int32 i = 0 ; i < nLength; i++)
-+ {
-+ if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
-+ pValue[i].Value >>= xInputStream;
-+ else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "URL" ) ) )
-+ pValue[i].Value >>= sURL;
-+ }
-+ if ( !xInputStream.is() )
-+ {
-+ OSL_ASSERT( 0 );
-+ return sal_False;
-+ }
-+ OString sFileName;
-+ sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
-+
-+ // An XML import service: what we push sax messages to..
-+ OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.XMLOasisImporter" ) );
-+ Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
-+
-+ // The XImporter sets up an empty target document for XDocumentHandler to write to..
-+ Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
-+ xImporter->setTargetDocument( mxDoc );
-+
-+ // OO Graphics Handler: abstract class to handle document SAX messages, concrete implementation here
-+ // writes to in-memory target doc
-+ DocumentHandler xHandler(xInternalHandler);
-+
-+ WPXInputStream* input = new WPXSvInputStream( xInputStream );
-+
-+ if (input->isOLEStream())
-+ {
-+ WPXInputStream* olestream = input->getDocumentOLEStream();
-+ if (olestream)
-+ {
-+ delete input;
-+ input = olestream;
-+ }
-+ }
-+
-+ OdgExporter exporter(&xHandler);
-+ bool tmpParseResult = libwpg::WPGraphics::parse(input, &exporter);
-+ if (input)
-+ delete input;
-+ xInputStream->closeInput();
-+ return tmpParseResult;
-+}
-+
-+void SAL_CALL WPGImportFilter::cancel( )
-+ throw (RuntimeException)
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter::cancel" << std::endl;
-+#endif
-+}
-+
-+// XImporter
-+void SAL_CALL WPGImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc )
-+ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter::setTargetDocument" << std::endl;
-+#endif
-+ meType = FILTER_IMPORT;
-+ mxDoc = xDoc;
-+}
-+
-+// XExtendedFilterDetection
-+OUString SAL_CALL WPGImportFilter::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor )
-+ throw( com::sun::star::uno::RuntimeException )
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter::detect" << std::endl;
-+#endif
-+ OUString sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "" ) );
-+ sal_Int32 nLength = Descriptor.getLength();
-+ sal_Int32 location = nLength;
-+ const PropertyValue * pValue = Descriptor.getConstArray();
-+ Reference < XInputStream > xInputStream;
-+ for ( sal_Int32 i = 0 ; i < nLength; i++)
-+ {
-+ if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "TypeName" ) ) )
-+ location=i;
-+ else if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "InputStream" ) ) )
-+ pValue[i].Value >>= xInputStream;
-+ }
-+
-+ WPXInputStream* input = new WPXSvInputStream( xInputStream );
-+
-+ if (input->isOLEStream())
-+ {
-+ WPXInputStream* olestream = input->getDocumentOLEStream();
-+ if (olestream)
-+ {
-+ delete input;
-+ input = olestream;
-+ }
-+ }
-+
-+ if (libwpg::WPGraphics::isSupported(input))
-+ sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_WordPerfect_Graphics" ) );
-+
-+ if (input)
-+ delete input;
-+
-+ if (!sTypeName.equalsAscii(""))
-+ {
-+ if ( location == Descriptor.getLength() )
-+ {
-+ Descriptor.realloc(nLength+1);
-+ Descriptor[location].Name = ::rtl::OUString::createFromAscii( "TypeName" );
-+ }
-+
-+ Descriptor[location].Value <<=sTypeName;
-+ }
-+ return sTypeName;
-+}
-+
-+
-+// XInitialization
-+void SAL_CALL WPGImportFilter::initialize( const Sequence< Any >& aArguments )
-+ throw (Exception, RuntimeException)
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter::initialize" << std::endl;
-+#endif
-+ Sequence < PropertyValue > aAnySeq;
-+ sal_Int32 nLength = aArguments.getLength();
-+ if ( nLength && ( aArguments[0] >>= aAnySeq ) )
-+ {
-+ const PropertyValue * pValue = aAnySeq.getConstArray();
-+ nLength = aAnySeq.getLength();
-+ for ( sal_Int32 i = 0 ; i < nLength; i++)
-+ {
-+ if ( pValue[i].Name.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "Type" ) ) )
-+ {
-+ pValue[i].Value >>= msFilterName;
-+ break;
-+ }
-+ }
-+ }
-+}
-+OUString WPGImportFilter_getImplementationName ()
-+ throw (RuntimeException)
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter_getImplementationName" << std::endl;
-+#endif
-+ return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.WPGImportFilter" ) );
-+}
-+
-+#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
-+#define SERVICE_NAME2 "com.sun.star.document.ExtendedTypeDetection"
-+sal_Bool SAL_CALL WPGImportFilter_supportsService( const OUString& ServiceName )
-+ throw (RuntimeException)
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter_supportsService" << std::endl;
-+#endif
-+ return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
-+ ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
-+}
-+Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames( )
-+ throw (RuntimeException)
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter_getSupportedServiceNames" << std::endl;
-+#endif
-+ Sequence < OUString > aRet(2);
-+ OUString* pArray = aRet.getArray();
-+ pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
-+ pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) );
-+ return aRet;
-+}
-+#undef SERVICE_NAME2
-+#undef SERVICE_NAME1
-+
-+Reference< XInterface > SAL_CALL WPGImportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
-+ throw( Exception )
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter_createInstance" << std::endl;
-+#endif
-+ return (cppu::OWeakObject*) new WPGImportFilter( rSMgr );
-+}
-+
-+// XServiceInfo
-+OUString SAL_CALL WPGImportFilter::getImplementationName( )
-+ throw (RuntimeException)
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter::getImplementationName" << std::endl;
-+#endif
-+ return WPGImportFilter_getImplementationName();
-+}
-+sal_Bool SAL_CALL WPGImportFilter::supportsService( const OUString& rServiceName )
-+ throw (RuntimeException)
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter::supportsService" << std::endl;
-+#endif
-+ return WPGImportFilter_supportsService( rServiceName );
-+}
-+Sequence< OUString > SAL_CALL WPGImportFilter::getSupportedServiceNames( )
-+ throw (RuntimeException)
-+{
-+#ifdef DEBUG
-+ std::cerr << "WPGImportFilter::getSupportedServiceNames" << std::endl;
-+#endif
-+ return WPGImportFilter_getSupportedServiceNames();
-+}
-diff --git writerperfect/source/wpgimp/WPGImportFilter.hxx writerperfect/source/wpgimp/WPGImportFilter.hxx
-new file mode 100644
-index 0000000..ae0f580
---- /dev/null
-+++ writerperfect/source/wpgimp/WPGImportFilter.hxx
-@@ -0,0 +1,128 @@
-+/*
-+ * Copyright (C) 2000 by Sun Microsystems, Inc.
-+ * Copyright (C) 2002-2004 William Lachance (wlach at interlog.com)
-+ * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
-+ * Copyright (C) 2004 Fridrich Strba <fridrich.strba at bluewin.ch>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ *
-+ * Contributor(s): Martin Gallwey (gallwey at sun.com)
-+ *
-+ */
-+
-+/* "This product is not manufactured, approved, or supported by
-+ * Corel Corporation or Corel Corporation Limited."
-+ */
-+#ifndef _WPGIMPORTFILTER_HXX
-+#define _WPGIMPORTFILTER_HXX
-+
-+#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
-+#include <com/sun/star/document/XFilter.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_
-+#include <com/sun/star/document/XImporter.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_DOCUMENT_XEXTENDEDFILTERDETECTION_HPP_
-+#include <com/sun/star/document/XExtendedFilterDetection.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
-+#include <com/sun/star/lang/XInitialization.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
-+#include <com/sun/star/lang/XServiceInfo.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
-+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-+#endif
-+#ifndef _CPPUHELPER_IMPLBASE5_HXX_
-+#include <cppuhelper/implbase5.hxx>
-+#endif
-+
-+#include <stdio.h>
-+
-+enum FilterType
-+{
-+ FILTER_IMPORT,
-+ FILTER_EXPORT
-+};
-+/* This component will be instantiated for both import or export. Whether it calls
-+ * setSourceDocument or setTargetDocument determines which Impl function the filter
-+ * member calls */
-+class WPGImportFilter : public cppu::WeakImplHelper5
-+<
-+ com::sun::star::document::XFilter,
-+ com::sun::star::document::XImporter,
-+ com::sun::star::document::XExtendedFilterDetection,
-+ com::sun::star::lang::XInitialization,
-+ com::sun::star::lang::XServiceInfo
-+>
-+{
-+protected:
-+ // oo.org declares
-+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
-+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
-+ ::rtl::OUString msFilterName;
-+ ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
-+
-+ FilterType meType;
-+
-+public:
-+ WPGImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF)
-+ : mxMSF( rxMSF ) {}
-+ virtual ~WPGImportFilter() {}
-+
-+ // XFilter
-+ virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-+ throw (::com::sun::star::uno::RuntimeException);
-+ virtual void SAL_CALL cancel( )
-+ throw (::com::sun::star::uno::RuntimeException);
-+
-+ // XImporter
-+ virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
-+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-+
-+ //XExtendedFilterDetection
-+ virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
-+ throw( com::sun::star::uno::RuntimeException );
-+
-+ // XInitialization
-+ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-+ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-+
-+ // XServiceInfo
-+ virtual ::rtl::OUString SAL_CALL getImplementationName( )
-+ throw (::com::sun::star::uno::RuntimeException);
-+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
-+ throw (::com::sun::star::uno::RuntimeException);
-+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
-+ throw (::com::sun::star::uno::RuntimeException);
-+
-+};
-+
-+::rtl::OUString WPGImportFilter_getImplementationName()
-+ throw ( ::com::sun::star::uno::RuntimeException );
-+
-+sal_Bool SAL_CALL WPGImportFilter_supportsService( const ::rtl::OUString& ServiceName )
-+ throw ( ::com::sun::star::uno::RuntimeException );
-+
-+::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames( )
-+ throw ( ::com::sun::star::uno::RuntimeException );
-+
-+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-+SAL_CALL WPGImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr)
-+ throw ( ::com::sun::star::uno::Exception );
-+
-+#endif
-diff --git writerperfect/source/wpgimp/makefile.mk writerperfect/source/wpgimp/makefile.mk
-new file mode 100644
-index 0000000..3bb58c1
---- /dev/null
-+++ writerperfect/source/wpgimp/makefile.mk
-@@ -0,0 +1,35 @@
-+PRJ=..$/..
-+
-+PRJNAME=writerperfect
-+TARGET=wpgimp
-+ENABLE_EXCEPTIONS=true
-+
-+.INCLUDE : settings.mk
-+
-+.IF "$(SYSTEM_LIBWPD)" == "YES"
-+INCPRE+=$(LIBWPD_CFLAGS)
-+.ELSE
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-+.ENDIF
-+
-+.IF "$(SYSTEM_LIBWPS)" == "YES"
-+INCPRE+=$(LIBWPS_CFLAGS)
-+.ELSE
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwps
-+.ENDIF
-+
-+.IF "$(SYSTEM_LIBWPG)" == "YES"
-+INCPRE+=$(LIBWPG_CFLAGS)
-+.ELSE
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
-+.ENDIF
-+
-+# broken but ... necessary, internal include shafted ...
-+INCPRE+= -I..
-+
-+SLOFILES= \
-+ $(SLO)$/OdgExporter.obj \
-+ $(SLO)$/WPGImportFilter.obj \
-+ $(SLO)$/wpgimport_genericfilter.obj
-+
-+.INCLUDE : target.mk
-diff --git writerperfect/source/wpgimp/wpgimport_genericfilter.cxx writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
-new file mode 100644
-index 0000000..4666abd
---- /dev/null
-+++ writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
-@@ -0,0 +1,101 @@
-+/* genericfilter: mostly generic code for registering the filter
-+ *
-+ * Portions of this code Copyright 2000 by Sun Microsystems, Inc.
-+ * Rest is Copyright (C) 2002 William Lachance (wlach at interlog.com)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ */
-+
-+/* "This product is not manufactured, approved, or supported by
-+ * Corel Corporation or Corel Corporation Limited."
-+ */
-+#include <stdio.h>
-+
-+#include <osl/mutex.hxx>
-+#include <osl/thread.h>
-+#include <cppuhelper/factory.hxx>
-+
-+#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
-+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-+#endif
-+
-+#include "WPGImportFilter.hxx"
-+
-+using namespace ::rtl;
-+using namespace ::cppu;
-+using namespace ::com::sun::star::uno;
-+using namespace ::com::sun::star::lang;
-+using namespace ::com::sun::star::registry;
-+
-+extern "C"
-+{
-+//==================================================================================================
-+void SAL_CALL component_getImplementationEnvironment(
-+ const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
-+{
-+ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-+}
-+//==================================================================================================
-+sal_Bool SAL_CALL component_writeInfo(
-+ void * /* pServiceManager */, void * pRegistryKey )
-+{
-+ if (pRegistryKey)
-+ {
-+ try
-+ {
-+ sal_Int32 nPos = 0;
-+ Reference< XRegistryKey > xNewKey(
-+ reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WPGImportFilter_getImplementationName() ) );
-+ xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-+
-+ const Sequence< OUString > & rSNL = WPGImportFilter_getSupportedServiceNames();
-+ const OUString * pArray = rSNL.getConstArray();
-+ for ( nPos = rSNL.getLength(); nPos--; )
-+ xNewKey->createKey( pArray[nPos] );
-+
-+ return sal_True;
-+ }
-+ catch (InvalidRegistryException &)
-+ {
-+ OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-+ }
-+ }
-+ return sal_False;
-+}
-+//==================================================================================================
-+void * SAL_CALL component_getFactory(
-+ const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
-+{
-+ void * pRet = 0;
-+
-+ OUString implName = OUString::createFromAscii( pImplName );
-+ if ( pServiceManager && implName.equals(WPGImportFilter_getImplementationName()) )
-+ {
-+ Reference< XSingleServiceFactory > xFactory( createSingleFactory(
-+ reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
-+ OUString::createFromAscii( pImplName ),
-+ WPGImportFilter_createInstance, WPGImportFilter_getSupportedServiceNames() ) );
-+
-+ if (xFactory.is())
-+ {
-+ xFactory->acquire();
-+ pRet = xFactory.get();
-+ }
-+ }
-+
-+ return pRet;
-+}
-+}
-diff --git writerperfect/util/makefile.mk writerperfect/util/makefile.mk
-index 56bdfb2..35daf5e 100644
---- writerperfect/util/makefile.mk
-+++ writerperfect/util/makefile.mk
-@@ -19,10 +19,17 @@ LIBWPS=$(LIBWPS_LIBS)
- LIBWPS=-lwpslib
- .ENDIF
-
-+.IF "$(SYSTEM_LIBWPG)" == "YES"
-+LIBWPG=$(LIBWPG_LIBS)
-+.ELSE
-+LIBWPG=-lwpglib
-+.ENDIF
-+
- .ELSE
-
- LIBWPD=$(LIBPRE) wpdlib.lib
- LIBWPS=$(LIBPRE) wpslib.lib
-+LIBWPG=$(LIBPRE) wpglib.lib
-
- .ENDIF
-
-@@ -79,4 +86,32 @@ SHL2LIBS = $(LIB2TARGET)
- SHL2VERSIONMAP = $(SOLARENV)/src/component.map
- DEF2NAME = $(SHL2TARGET)
-
-+LIB3TARGET= $(SLB)$/wpgimport.lib
-+LIB3FILES= \
-+ $(SLB)$/stream.lib \
-+ $(SLB)$/filter.lib \
-+ $(SLB)$/wpgimp.lib
-+SHL3LIBS=$(LIB3TARGET)
-+SHL3STDLIBS+= \
-+ $(SVLLIB) \
-+ $(SOTLIB) \
-+ $(SO2LIB) \
-+ $(SVTOOLLIB) \
-+ $(UNOTOOLSLIB) \
-+ $(TOOLSLIB) \
-+ $(COMPHELPERLIB) \
-+ $(UCBHELPERLIB) \
-+ $(CPPUHELPERLIB) \
-+ $(CPPULIB) \
-+ $(SALLIB) \
-+ $(XMLOFFLIB) \
-+ $(LIBWPD) \
-+ $(LIBWPG)
-+
-+SHL3TARGET = wpgimport$(DLLPOSTFIX)
-+SHL3IMPLIB = i$(SHL3TARGET)
-+SHL3LIBS = $(LIB3TARGET)
-+SHL3VERSIONMAP = $(SOLARENV)/src/component.map
-+DEF3NAME = $(SHL3TARGET)
-+
- .INCLUDE : target.mk
---
-1.7.0.1
-
diff --git a/patches/dev300/wps-registry.diff b/patches/dev300/wps-registry.diff
deleted file mode 100644
index 6b483b7..0000000
--- a/patches/dev300/wps-registry.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- scp2/source/writer/registryitem_writer.scp | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git scp2/source/writer/registryitem_writer.scp scp2/source/writer/registryitem_writer.scp
-index 8c3f0a5..925c887 100644
---- scp2/source/writer/registryitem_writer.scp
-+++ scp2/source/writer/registryitem_writer.scp
-@@ -1341,6 +1341,15 @@ RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
- Value = " ";
- End
-
-+// .WPS
-+RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
-+ ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-+ Subkey = ".wps\OpenWithProgIDs";
-+ ModuleID = gid_Module_Prg_Wrt_Bin;
-+ Name = "opendocument.WriterDocument.1";
-+ Value = " ";
-+End
-+
- // .HWP
- RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
---
-1.7.0.1
-
diff --git a/patches/dev300/wpsimport-config_office.diff b/patches/dev300/wpsimport-config_office.diff
deleted file mode 100644
index 5e35993..0000000
--- a/patches/dev300/wpsimport-config_office.diff
+++ /dev/null
@@ -1,61 +0,0 @@
----
- configure.in | 21 +++++++++++++++++++++
- set_soenv.in | 3 +++
- 2 files changed, 24 insertions(+), 0 deletions(-)
-
-diff --git configure.in configure.in
-index 0f658c8..a062c42 100644
---- configure.in
-+++ configure.in
-@@ -343,6 +343,9 @@ AC_ARG_WITH(system-expat,
- AC_ARG_WITH(system-libwpd,
- [ --with-system-libwpd Use libwpd already on system
- ],,)
-+AC_ARG_WITH(system-libwps,
-+[ --with-system-libwps Use libwps already on system
-+],,)
- AC_ARG_WITH(system-libxml,
- [ --with-system-libxml Use libxml already on system
- ],,)
-@@ -3644,6 +3647,24 @@ AC_SUBST(FREETYPE_CFLAGS)
- AC_SUBST(FREETYPE_LIBS)
-
- dnl ===================================================================
-+dnl Check for system libwps
-+dnl ===================================================================
-+AC_MSG_CHECKING([which libwps to use])
-+if test -n "$with_system_libwps" -o -n "$with_system_libs" && \
-+ test "$with_system_libwps" != "no"; then
-+ AC_MSG_RESULT([external])
-+ SYSTEM_LIBWPS=YES
-+ PKG_CHECK_MODULES( LIBWPS, libwps-0.1 )
-+else
-+ AC_MSG_RESULT([internal])
-+ SYSTEM_LIBWPS=NO
-+ BUILD_TYPE="$BUILD_TYPE LIBWPS"
-+fi
-+AC_SUBST(SYSTEM_LIBWPS)
-+AC_SUBST(LIBWPS_CFLAGS)
-+AC_SUBST(LIBWPS_LIBS)
-+
-+dnl ===================================================================
- dnl Check whether freetype2 supports emboldening
- dnl ===================================================================
- if test "$test_freetype" = "yes"; then
-diff --git set_soenv.in set_soenv.in
-index 7983933..94a3cd9 100644
---- set_soenv.in
-+++ set_soenv.in
-@@ -1859,6 +1859,9 @@ ToFile( "XRANDR_DLOPEN", "@XRANDR_DLOPEN@", "e" );
- ToFile( "SYSTEM_LIBWPD", "@SYSTEM_LIBWPD@", "e" );
- ToFile( "LIBWPD_CFLAGS", "@LIBWPD_CFLAGS@", "e" );
- ToFile( "LIBWPD_LIBS", "@LIBWPD_LIBS@", "e" );
-+ToFile( "SYSTEM_LIBWPS", "@SYSTEM_LIBWPS@", "e" );
-+ToFile( "LIBWPS_CFLAGS", "@LIBWPS_CFLAGS@", "e" );
-+ToFile( "LIBWPS_LIBS", "@LIBWPS_LIBS@", "e" );
- ToFile( "SYSTEM_CPPUNIT", "@SYSTEM_CPPUNIT@", "e" );
- ToFile( "CPPUNIT_CFLAGS", "@CPPUNIT_CFLAGS@", "e" );
- ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" );
---
-1.7.0.1
-
diff --git a/patches/dev300/wpsimport-filter.diff b/patches/dev300/wpsimport-filter.diff
deleted file mode 100644
index bcc891a..0000000
--- a/patches/dev300/wpsimport-filter.diff
+++ /dev/null
@@ -1,68 +0,0 @@
----
- filter/source/config/fragments/fcfg_writer.mk | 2 ++
- .../source/config/fragments/filters/MS_Works.xcu | 13 +++++++++++++
- .../fragments/types/writer_MS_Works_Document.xcu | 12 ++++++++++++
- 3 files changed, 27 insertions(+), 0 deletions(-)
- create mode 100644 filter/source/config/fragments/filters/MS_Works.xcu
- create mode 100644 filter/source/config/fragments/types/writer_MS_Works_Document.xcu
-
-diff --git filter/source/config/fragments/fcfg_writer.mk filter/source/config/fragments/fcfg_writer.mk
-index 2207880..005a970 100644
---- filter/source/config/fragments/fcfg_writer.mk
-+++ filter/source/config/fragments/fcfg_writer.mk
-@@ -18,6 +18,7 @@ T4_WRITER = \
- writer_Rich_Text_Format \
- writer_StarOffice_XML_Writer \
- writer_WordPerfect_Document \
-+ writer_MS_Works_Document \
- writer_T602_Document \
- writer_Text \
- writer_Text_encoded \
-@@ -48,6 +49,7 @@ F4_WRITER = \
- Rich_Text_Format \
- StarOffice_XML__Writer_ \
- WordPerfect \
-+ MS_Works \
- T602Document \
- Text \
- Text__encoded_ \
-diff --git filter/source/config/fragments/filters/MS_Works.xcu filter/source/config/fragments/filters/MS_Works.xcu
-new file mode 100644
-index 0000000..29d11f7
---- /dev/null
-+++ filter/source/config/fragments/filters/MS_Works.xcu
-@@ -0,0 +1,13 @@
-+ <node oor:name="MS_Works" oor:op="replace">
-+ <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER</value></prop>
-+ <prop oor:name="UIComponent"/>
-+ <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MSWorksImportFilter</value></prop>
-+ <prop oor:name="UserData"><value>WPS</value></prop>
-+ <prop oor:name="UIName">
-+ <value xml:lang="x-default">Microsoft Works Document</value>
-+ </prop>
-+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
-+ <prop oor:name="Type"><value>writer_MS_Works_Document</value></prop>
-+ <prop oor:name="TemplateName"/>
-+ <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
-+ </node>
-diff --git filter/source/config/fragments/types/writer_MS_Works_Document.xcu filter/source/config/fragments/types/writer_MS_Works_Document.xcu
-new file mode 100644
-index 0000000..0b074d8
---- /dev/null
-+++ filter/source/config/fragments/types/writer_MS_Works_Document.xcu
-@@ -0,0 +1,12 @@
-+ <node oor:name="writer_MS_Works_Document" oor:op="replace" >
-+ <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.MSWorksImportFilter</value></prop>
-+ <prop oor:name="URLPattern"/>
-+ <prop oor:name="Extensions"><value>wps</value></prop>
-+ <prop oor:name="MediaType"/>
-+ <prop oor:name="Preferred"><value>true</value></prop>
-+ <prop oor:name="PreferredFilter"><value>MS_Works</value></prop>
-+ <prop oor:name="UIName">
-+ <value>Microsoft Works Document</value>
-+ </prop>
-+ <prop oor:name="ClipboardFormat"/>
-+ </node>
---
-1.7.0.1
-
diff --git a/patches/dev300/wpsimport-scp2.diff b/patches/dev300/wpsimport-scp2.diff
deleted file mode 100644
index 8b961e1..0000000
--- a/patches/dev300/wpsimport-scp2.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- scp2/source/ooo/file_library_ooo.scp | 2 ++
- scp2/source/writer/module_writer.scp | 2 +-
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
-index 404a158..190598f 100644
---- scp2/source/ooo/file_library_ooo.scp
-+++ scp2/source/ooo/file_library_ooo.scp
-@@ -937,6 +937,8 @@ End
-
- STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft)
-
-+STD_UNO_LIB_FILE(gid_File_Lib_Msworks,msworks)
-+
- STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
-
- STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-diff --git scp2/source/writer/module_writer.scp scp2/source/writer/module_writer.scp
-index 0d959dd..fc9d52a 100644
---- scp2/source/writer/module_writer.scp
-+++ scp2/source/writer/module_writer.scp
-@@ -49,7 +49,7 @@ Module gid_Module_Prg_Wrt_Bin
- gid_File_Lib_Swui,
- gid_File_Lib_Msword,
- gid_File_Lib_Wpft,
-- gid_File_Lib_Writerfilter,
-+ gid_File_Lib_Msworks,
- gid_File_Lib_T602Filter,
- gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
- gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
---
-1.7.0.1
-
diff --git a/patches/dev300/wpsimport-writerperfect.diff b/patches/dev300/wpsimport-writerperfect.diff
deleted file mode 100644
index 01097ee..0000000
--- a/patches/dev300/wpsimport-writerperfect.diff
+++ /dev/null
@@ -1,1037 +0,0 @@
----
- writerperfect/prj/build.lst | 5 +-
- writerperfect/prj/d.lst | 4 +-
- writerperfect/source/filter/DocumentCollector.cxx | 2 +-
- writerperfect/source/filter/DocumentCollector.hxx | 7 +-
- writerperfect/source/filter/DocumentHandler.cxx | 10 +-
- writerperfect/source/filter/SectionStyle.cxx | 2 +-
- writerperfect/source/filter/makefile.mk | 12 +-
- writerperfect/source/stream/WPXSvStream.cxx | 2 +-
- writerperfect/source/stream/WPXSvStream.h | 3 +-
- writerperfect/source/stream/makefile.mk | 6 +
- .../source/wpdimp/WordPerfectCollector.cxx | 5 +-
- .../source/wpdimp/WordPerfectCollector.hxx | 4 +-
- writerperfect/source/wpdimp/makefile.mk | 12 +-
- writerperfect/source/wpsimp/MSWorksCollector.cxx | 48 +++
- writerperfect/source/wpsimp/MSWorksCollector.hxx | 41 +++
- .../source/wpsimp/MSWorksImportFilter.cxx | 303 ++++++++++++++++++++
- .../source/wpsimp/MSWorksImportFilter.hxx | 129 +++++++++
- writerperfect/source/wpsimp/makefile.mk | 29 ++
- .../source/wpsimp/msworks_genericfilter.cxx | 101 +++++++
- writerperfect/util/makefile.mk | 47 +++-
- 20 files changed, 739 insertions(+), 33 deletions(-)
- create mode 100644 writerperfect/source/wpsimp/MSWorksCollector.cxx
- create mode 100644 writerperfect/source/wpsimp/MSWorksCollector.hxx
- create mode 100644 writerperfect/source/wpsimp/MSWorksImportFilter.cxx
- create mode 100644 writerperfect/source/wpsimp/MSWorksImportFilter.hxx
- create mode 100644 writerperfect/source/wpsimp/makefile.mk
- create mode 100644 writerperfect/source/wpsimp/msworks_genericfilter.cxx
-
-diff --git writerperfect/prj/build.lst writerperfect/prj/build.lst
-index 3bb3867..d708c33 100644
---- writerperfect/prj/build.lst
-+++ writerperfect/prj/build.lst
-@@ -1,6 +1,7 @@
--wp writerperfect : LIBWPD:libwpd sot comphelper xmloff NULL
-+wp writerperfect : LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools 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
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list