ooo-build r14539 - in branches/ooo-build-3-0: . bin patches/dev300
- From: strba svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14539 - in branches/ooo-build-3-0: . bin patches/dev300
- Date: Wed, 19 Nov 2008 09:01:49 +0000 (UTC)
Author: strba
Date: Wed Nov 19 09:01:49 2008
New Revision: 14539
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14539&view=rev
Log:
make UnstableLibwpd section buildable without use of black magic
Modified:
branches/ooo-build-3-0/ChangeLog
branches/ooo-build-3-0/bin/unpack
branches/ooo-build-3-0/download.in
branches/ooo-build-3-0/patches/dev300/libwpd-testing.diff
branches/ooo-build-3-0/patches/dev300/libwpg-testing.diff
branches/ooo-build-3-0/patches/dev300/libwps-testing.diff
branches/ooo-build-3-0/patches/dev300/writerperfect-testing.diff
Modified: branches/ooo-build-3-0/bin/unpack
==============================================================================
--- branches/ooo-build-3-0/bin/unpack (original)
+++ branches/ooo-build-3-0/bin/unpack Wed Nov 19 09:01:49 2008
@@ -706,6 +706,11 @@
echo "Copying libwpd package into the tree"
mkdir -p $OOBUILDDIR/libwpd/download || exit 1
$GNUCP -a $SRCDIR/$LIBWPD_PACKAGE $OOBUILDDIR/libwpd/download/ || exit 1
+ LIBWPD_UNSTABLE_PACKAGE=libwpd-0.9.0~CVS20081118.tar.gz
+ check_tarball $SRCDIR/$LIBWPD_UNSTABLE_PACKAGE
+ echo "Copying unstable libwpd package into the tree"
+ mkdir -p $OOBUILDDIR/libwpd/download || exit 1
+ $GNUCP -a $SRCDIR/$LIBWPD_UNSTABLE_PACKAGE $OOBUILDDIR/libwpd/download/ || exit 1
fi
if test "$SYSTEM_LIBWPS" != "YES"; then
@@ -714,6 +719,11 @@
echo "Copying libwps package into the tree"
mkdir -p $OOBUILDDIR/libwps/download || exit 1
$GNUCP -a $SRCDIR/$LIBWPS_PACKAGE $OOBUILDDIR/libwps/download/ || exit 1
+ LIBWPS_UNSTABLE_PACKAGE=libwps-0.2.0~CVS20081118.tar.gz
+ check_tarball $SRCDIR/$LIBWPS_UNSTABLE_PACKAGE
+ echo "Copying unstable libwps package into the tree"
+ mkdir -p $OOBUILDDIR/libwps/download || exit 1
+ $GNUCP -a $SRCDIR/$LIBWPS_UNSTABLE_PACKAGE $OOBUILDDIR/libwps/download/ || exit 1
fi
if test "$SYSTEM_LIBWPG" != "YES"; then
@@ -722,6 +732,11 @@
echo "Copying libwpg package into the tree"
mkdir -p $OOBUILDDIR/libwpg/download || exit 1
$GNUCP -a $SRCDIR/$LIBWPG_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
+ LIBWPG_UNSTABLE_PACKAGE=libwpg-0.2.0~CVS20081118.tar.gz
+ check_tarball $SRCDIR/$LIBWPG_UNSTABLE_PACKAGE
+ echo "Copying unstable libwpg package into the tree"
+ mkdir -p $OOBUILDDIR/libwpg/download || exit 1
+ $GNUCP -a $SRCDIR/$LIBWPG_UNSTABLE_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
fi
if test "$ENABLE_SCSOLVER" = "YES"; then
Modified: branches/ooo-build-3-0/download.in
==============================================================================
--- branches/ooo-build-3-0/download.in (original)
+++ branches/ooo-build-3-0/download.in Wed Nov 19 09:01:49 2008
@@ -343,14 +343,17 @@
if ('@SYSTEM_LIBWPD@' eq 'NO') {
push @files, ( 'libwpd-0.8.14.tar.gz' );
+ push @files, ( 'libwpd-0.9.0~CVS20081118.tar.gz' );
}
if ('@SYSTEM_LIBWPS@' eq 'NO') {
push @files, ( 'libwps-0.1.2.tar.gz' );
+ push @files, ( 'libwps-0.2.0~CVS20081118.tar.gz' );
}
if ('@SYSTEM_LIBWPG@' eq 'NO') {
push @files, ( 'libwpg-0.1.3.tar.gz' );
+ push @files, ( 'libwpg-0.2.0~CVS20081118.tar.gz' );
}
if ('@OOOP_FONTS_PACK@' ne '') {
Modified: branches/ooo-build-3-0/patches/dev300/libwpd-testing.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/libwpd-testing.diff (original)
+++ branches/ooo-build-3-0/patches/dev300/libwpd-testing.diff Wed Nov 19 09:01:49 2008
@@ -5,7 +5,7 @@
.ENDIF
-TARFILE_NAME=libwpd-0.8.14
-+TARFILE_NAME=libwpd-0.9.0
++TARFILE_NAME=libwpd-0.9.0~CVS20081118
#PATCH_FILE_NAME=$(TARFILE_NAME).diff
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
Modified: branches/ooo-build-3-0/patches/dev300/libwpg-testing.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/libwpg-testing.diff (original)
+++ branches/ooo-build-3-0/patches/dev300/libwpg-testing.diff Wed Nov 19 09:01:49 2008
@@ -8,7 +8,7 @@
.ENDIF
-TARFILE_NAME=libwpg-0.1.3
-+TARFILE_NAME=libwpg-0.2.0
++TARFILE_NAME=libwpg-0.2.0~CVS20081118
#PATCH_FILE_NAME=$(TARFILE_NAME).diff
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src/lib
Modified: branches/ooo-build-3-0/patches/dev300/libwps-testing.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/libwps-testing.diff (original)
+++ branches/ooo-build-3-0/patches/dev300/libwps-testing.diff Wed Nov 19 09:01:49 2008
@@ -8,7 +8,7 @@
.ENDIF
-TARFILE_NAME=libwps-0.1.2
-+TARFILE_NAME=libwps-0.2.0
++TARFILE_NAME=libwps-0.2.0~CVS20081118
#PATCH_FILE_NAME=$(TARFILE_NAME).diff
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src/lib
Modified: branches/ooo-build-3-0/patches/dev300/writerperfect-testing.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/writerperfect-testing.diff (original)
+++ branches/ooo-build-3-0/patches/dev300/writerperfect-testing.diff Wed Nov 19 09:01:49 2008
@@ -1,5 +1,15 @@
---- writerperfect/source/filter/DocumentCollector.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/DocumentCollector.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//prj/build.lst writerperfect//prj/build.lst
+--- writerperfect//prj/build.lst 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//prj/build.lst 2008-11-17 23:37:06.000000000 +0100
+@@ -1,4 +1,4 @@
+-wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff NULL
++wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff sfx2 NULL
+ wp writerperfect usr1 - all wp_mkout NULL
+ wp writerperfect\source\stream nmake - all wp_stream NULL
+ wp writerperfect\source\filter nmake - all wp_filter NULL
+diff -u -r -N writerperfect//source/filter/DocumentCollector.cxx writerperfect//source/filter/DocumentCollector.cxx
+--- writerperfect//source/filter/DocumentCollector.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/DocumentCollector.cxx 2008-11-17 23:30:51.000000000 +0100
@@ -39,6 +39,8 @@
#include "DocumentCollector.hxx"
@@ -227,7 +237,7 @@
+ textBodyStyleOpenElement.write(pHandler);
+
+ pHandler->endElement("style:style");
-+
+
+ TagOpenElement tableContentsStyleOpenElement("style:style");
+ tableContentsStyleOpenElement.addAttribute("style:name", "Table_Contents");
+ tableContentsStyleOpenElement.addAttribute("style:display-name", "Table Contents");
@@ -251,7 +261,7 @@
+ for (std::vector<DocumentElement *>::const_iterator iter = mFrameStyles.begin();
+ iter != mFrameStyles.end(); iter++)
+ (*iter)->write(pHandler);
-
++
+ pHandler->endElement("office:styles");
}
@@ -1100,33 +1110,33 @@
+
+ mpCurrentContentElements->push_back(new TagCloseElement("text:note-body"));
+ mpCurrentContentElements->push_back(new TagCloseElement("text:note"));
-+}
-+
-+void DocumentCollector::openComment(const WPXPropertyList & /* propList */)
-+{
-+ mWriterListStates.push(WriterListState());
-+ mpCurrentContentElements->push_back(new TagOpenElement("office:annotation"));
-+
-+ mWriterDocumentStates.top().mbInNote = true;
}
-void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
-+void DocumentCollector::closeComment()
++void DocumentCollector::openComment(const WPXPropertyList & /* propList */)
{
- WPXString sTableName;
- sTableName.sprintf("Table%i", mTableStyles.size());
-+ mWriterDocumentStates.top().mbInNote = false;
-+ if (mWriterListStates.size() > 1)
-+ mWriterListStates.pop();
++ mWriterListStates.push(WriterListState());
++ mpCurrentContentElements->push_back(new TagOpenElement("office:annotation"));
- // FIXME: we base the table style off of the page's margin left, ignoring (potential) wordperfect margin
- // state which is transmitted inside the page. could this lead to unacceptable behaviour?
- // WLACH_REFACTORING: characterize this behaviour, probably should nip it at the bud within libwpd
- TableStyle *pTableStyle = new TableStyle(propList, columns, sTableName.cstr());
-+ mpCurrentContentElements->push_back(new TagCloseElement("office:annotation"));
++ mWriterDocumentStates.top().mbInNote = true;
+}
++
++void DocumentCollector::closeComment()
++{
++ mWriterDocumentStates.top().mbInNote = false;
++ if (mWriterListStates.size() > 1)
++ mWriterListStates.pop();
- if (mWriterDocumentState.mbFirstElement && mpCurrentContentElements == &mBodyElements)
++ mpCurrentContentElements->push_back(new TagCloseElement("office:annotation"));
++}
++
+void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
+{
+ if (!mWriterDocumentStates.top().mbInNote)
@@ -1168,13 +1178,13 @@
- pTableColumnOpenElement->addAttribute("table:style-name", sColumnStyleName.cstr());
- mpCurrentContentElements->push_back(pTableColumnOpenElement);
+ TagOpenElement *pTableOpenElement = new TagOpenElement("table:table");
-+
-+ pTableOpenElement->addAttribute("table:name", sTableName.cstr());
-+ pTableOpenElement->addAttribute("table:style-name", sTableName.cstr());
-+ mpCurrentContentElements->push_back(pTableOpenElement);
- TagCloseElement *pTableColumnCloseElement = new TagCloseElement("table:table-column");
- mpCurrentContentElements->push_back(pTableColumnCloseElement);
++ pTableOpenElement->addAttribute("table:name", sTableName.cstr());
++ pTableOpenElement->addAttribute("table:style-name", sTableName.cstr());
++ mpCurrentContentElements->push_back(pTableOpenElement);
++
+ for (int i=0; i<pTableStyle->getNumColumns(); i++)
+ {
+ TagOpenElement *pTableColumnOpenElement = new TagOpenElement("table:table-column");
@@ -1328,7 +1338,7 @@
}
void DocumentCollector::insertText(const WPXString &text)
-@@ -929,3 +1064,195 @@
+@@ -929,3 +1064,223 @@
DocumentElement *pText = new TextElement(text);
mpCurrentContentElements->push_back(pText);
}
@@ -1380,6 +1390,9 @@
+ if (propList["fo:max-height"])
+ frameStylePropertiesOpenElement->addAttribute("fo:max-height", propList["fo:max-height"]->getStr());
+
++ if (propList["style:wrap"])
++ frameStylePropertiesOpenElement->addAttribute("style:wrap", propList["style:wrap"]->getStr());
++
+ mFrameStyles.push_back(frameStylePropertiesOpenElement);
+
+ mFrameStyles.push_back(new TagCloseElement("style:graphic-properties"));
@@ -1423,6 +1436,9 @@
+ if (propList["fo:max-height"])
+ frameAutomaticStylePropertiesElement->addAttribute("fo:max-height", propList["fo:max-height"]->getStr());
+
++ if (propList["style:wrap"])
++ frameAutomaticStylePropertiesElement->addAttribute("style:wrap", propList["style:wrap"]->getStr());
++
+ frameAutomaticStylePropertiesElement->addAttribute("draw:ole-draw-aspect", "1");
+
+ mFrameAutomaticStyles.push_back(frameAutomaticStylePropertiesElement);
@@ -1479,25 +1495,47 @@
+ mWriterDocumentStates.top().mbInFrame = false;
+}
+
-+void DocumentCollector::insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData *object)
++void DocumentCollector::insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &object)
+{
-+ if (!object || !object->size())
++ if (!object.size())
+ return;
+ if (!mWriterDocumentStates.top().mbInFrame) // Embedded objects without a frame simply don't make sense for us
+ return;
-+ if (!propList["libwpd:mimetype"] || !(propList["libwpd:mimetype"]->getStr() == "image/x-wpg"))
++ if (!propList["libwpd:mimetype"])
+ return;
+
-+ std::vector<DocumentElement *> tmpContentElements;
-+ InternalHandler tmpHandler(&tmpContentElements);
-+ OdgExporter exporter(&tmpHandler, true);
-+
-+ if (libwpg::WPGraphics::parse(const_cast<WPXInputStream *>(object->getDataStream()), &exporter) && !tmpContentElements.empty())
-+ {
-+ mpCurrentContentElements->push_back(new TagOpenElement("draw:object"));
-+ for (std::vector<DocumentElement *>::const_iterator iter = tmpContentElements.begin(); iter != tmpContentElements.end(); iter++)
-+ mpCurrentContentElements->push_back(*iter);
-+ mpCurrentContentElements->push_back(new TagCloseElement("draw:object"));
++ if (propList["libwpd:mimetype"]->getStr() == "image/x-wpg")
++ {
++ std::vector<DocumentElement *> tmpContentElements;
++ InternalHandler tmpHandler(&tmpContentElements);
++ OdgExporter exporter(&tmpHandler, true);
++
++ libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
++
++ if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(object.getDataStream())))
++ fileFormat = libwpg::WPG_WPG1;
++
++ if (libwpg::WPGraphics::parse(const_cast<WPXInputStream *>(object.getDataStream()), &exporter, fileFormat) && !tmpContentElements.empty())
++ {
++ mpCurrentContentElements->push_back(new TagOpenElement("draw:object"));
++ for (std::vector<DocumentElement *>::const_iterator iter = tmpContentElements.begin(); iter != tmpContentElements.end(); iter++)
++ mpCurrentContentElements->push_back(*iter);
++ mpCurrentContentElements->push_back(new TagCloseElement("draw:object"));
++ }
++ }
++ else
++ {
++ mpCurrentContentElements->push_back(new TagOpenElement("draw:image"));
++
++ mpCurrentContentElements->push_back(new TagOpenElement("office:binary-data"));
++
++ WPXString binaryBase64Data = object.getBase64Data();
++
++ mpCurrentContentElements->push_back(new CharDataElement(binaryBase64Data.cstr()));
++
++ mpCurrentContentElements->push_back(new TagCloseElement("office:binary-data"));
++
++ mpCurrentContentElements->push_back(new TagCloseElement("draw:image"));
+ }
+}
+
@@ -1524,8 +1562,9 @@
+ mpCurrentContentElements->push_back(new TagCloseElement("draw:text-box"));
+}
+
---- writerperfect/source/filter/DocumentCollector.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/DocumentCollector.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/DocumentCollector.hxx writerperfect//source/filter/DocumentCollector.hxx
+--- writerperfect//source/filter/DocumentCollector.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/DocumentCollector.hxx 2008-11-17 23:31:21.000000000 +0100
@@ -45,8 +45,9 @@
#include <stack>
#include <string.h>
@@ -1616,7 +1655,7 @@
+ virtual void openFrame(const WPXPropertyList & propList);
+ virtual void closeFrame();
+
-+ virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData *object);
++ virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &object);
+
+ virtual bool parseSourceDocument(WPXInputStream &input) = 0;
@@ -1697,8 +1736,9 @@
};
#endif
---- writerperfect/source/filter/DocumentElement.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/DocumentElement.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/DocumentElement.cxx writerperfect//source/filter/DocumentElement.cxx
+--- writerperfect//source/filter/DocumentElement.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/DocumentElement.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -26,6 +26,7 @@
*/
@@ -1745,8 +1785,9 @@
WPXPropertyList xBlankAttrList;
WPXString sTemp;
---- writerperfect/source/filter/DocumentElement.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/DocumentElement.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/DocumentElement.hxx writerperfect//source/filter/DocumentElement.hxx
+--- writerperfect//source/filter/DocumentElement.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/DocumentElement.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -21,36 +21,31 @@
*
*/
@@ -1834,8 +1875,9 @@
-
+
#endif
---- writerperfect/source/filter/DocumentHandler.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/DocumentHandler.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/DocumentHandler.hxx writerperfect//source/filter/DocumentHandler.hxx
+--- writerperfect//source/filter/DocumentHandler.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/DocumentHandler.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -11,10 +11,12 @@
#pragma warning( pop )
#endif
@@ -1850,8 +1892,9 @@
{
public:
DocumentHandler(Reference < XDocumentHandler > &xHandler);
---- writerperfect/source/filter/DocumentHandlerInterface.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/DocumentHandlerInterface.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/DocumentHandlerInterface.hxx writerperfect//source/filter/DocumentHandlerInterface.hxx
+--- writerperfect//source/filter/DocumentHandlerInterface.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/DocumentHandlerInterface.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2004 William Lachance (wlach interlog com)
@@ -1898,8 +1941,9 @@
+ virtual void characters(const WPXString &sCharacters) = 0;
+};
+#endif
---- writerperfect/source/filter/FontStyle.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/FontStyle.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/FontStyle.cxx writerperfect//source/filter/FontStyle.cxx
+--- writerperfect//source/filter/FontStyle.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/FontStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -29,7 +29,7 @@
#include "DocumentElement.hxx"
@@ -1928,8 +1972,9 @@
+ TagCloseElement styleClose("style:font-face");
styleClose.write(pHandler);
}
---- writerperfect/source/filter/FontStyle.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/FontStyle.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/FontStyle.hxx writerperfect//source/filter/FontStyle.hxx
+--- writerperfect//source/filter/FontStyle.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/FontStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -21,28 +21,23 @@
*
*/
@@ -1962,8 +2007,9 @@
const WPXString &getFontFamily() const { return msFontFamily; }
private:
---- writerperfect/source/filter/GraphicsStyle.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/GraphicsStyle.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/GraphicsStyle.cxx writerperfect//source/filter/GraphicsStyle.cxx
+--- writerperfect//source/filter/GraphicsStyle.cxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/GraphicsStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,40 @@
+/* GraphicsStyle:
+ *
@@ -2005,8 +2051,9 @@
+void GraphicsStyle::write(DocumentHandlerInterface * /* pHandler */) const
+{
+}
---- writerperfect/source/filter/GraphicsStyle.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/GraphicsStyle.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/GraphicsStyle.hxx writerperfect//source/filter/GraphicsStyle.hxx
+--- writerperfect//source/filter/GraphicsStyle.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/GraphicsStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,40 @@
+/* GraphicsStyle:
+ *
@@ -2048,8 +2095,9 @@
+ virtual void write(DocumentHandlerInterface *pHandler) const;
+};
+#endif
---- writerperfect/source/filter/InternalHandler.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/InternalHandler.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/InternalHandler.cxx writerperfect//source/filter/InternalHandler.cxx
+--- writerperfect//source/filter/InternalHandler.cxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/InternalHandler.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2007 Fridrich Strba strba bluewin ch)
@@ -2105,8 +2153,9 @@
+{
+ mpElements->push_back(new CharDataElement(sCharacters.cstr()));
+}
---- writerperfect/source/filter/InternalHandler.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/InternalHandler.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/InternalHandler.hxx writerperfect//source/filter/InternalHandler.hxx
+--- writerperfect//source/filter/InternalHandler.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/InternalHandler.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2007 Fridrich Strba strba bluewin ch)
@@ -2154,8 +2203,9 @@
+ std::vector<DocumentElement *> *mpElements;
+};
+#endif
---- writerperfect/source/filter/ListStyle.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/ListStyle.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/ListStyle.cxx writerperfect//source/filter/ListStyle.cxx
+--- writerperfect//source/filter/ListStyle.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/ListStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -29,7 +29,7 @@
#include "DocumentElement.hxx"
@@ -2285,8 +2335,9 @@
{
TagOpenElement listStyleOpenElement("text:list-style");
listStyleOpenElement.addAttribute("style:name", getName());
---- writerperfect/source/filter/ListStyle.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/ListStyle.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/ListStyle.hxx writerperfect//source/filter/ListStyle.hxx
+--- writerperfect//source/filter/ListStyle.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/ListStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -21,23 +21,18 @@
*
*/
@@ -2348,8 +2399,9 @@
const int getListID() { return miListID; }
const bool isListLevelDefined(int iLevel) const;
---- writerperfect/source/filter/makefile.mk 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/makefile.mk 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/makefile.mk writerperfect//source/filter/makefile.mk
+--- writerperfect//source/filter/makefile.mk 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/makefile.mk 2008-11-17 22:07:19.000000000 +0100
@@ -10,6 +10,10 @@
INCPRE+=$(LIBWPD_CFLAGS)
.ENDIF
@@ -2388,8 +2440,9 @@
+ $(SLO)$/TextRunStyle.obj
.INCLUDE : target.mk
---- writerperfect/source/filter/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/OdgExporter.cxx 2008-07-18 10:38:52.000000000 +0200
+diff -u -r -N writerperfect//source/filter/OdgExporter.cxx writerperfect//source/filter/OdgExporter.cxx
+--- writerperfect//source/filter/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/OdgExporter.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,647 @@
+/* libwpg
+ * Copyright (C) 2006 Ariya Hidayat (ariya kde org)
@@ -3038,8 +3091,9 @@
+ }
+ return WPXString(stringValue.c_str());
+}
---- writerperfect/source/filter/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/OdgExporter.hxx 2008-07-18 10:38:52.000000000 +0200
+diff -u -r -N writerperfect//source/filter/OdgExporter.hxx writerperfect//source/filter/OdgExporter.hxx
+--- writerperfect//source/filter/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/OdgExporter.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -0,0 +1,89 @@
+/* libwpg
+ * Copyright (C) 2006 Ariya Hidayat (ariya kde org)
@@ -3130,8 +3184,9 @@
+};
+
+#endif // __ODGEXPORTER_HXX__
---- writerperfect/source/filter/PageSpan.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/PageSpan.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/PageSpan.cxx writerperfect//source/filter/PageSpan.cxx
+--- writerperfect//source/filter/PageSpan.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/PageSpan.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -87,39 +87,38 @@
return 0; // should never happen
}
@@ -3271,8 +3326,9 @@
- headerFooterClose.write(pHandler);
}
-
---- writerperfect/source/filter/PageSpan.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/PageSpan.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/PageSpan.hxx writerperfect//source/filter/PageSpan.hxx
+--- writerperfect//source/filter/PageSpan.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/PageSpan.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -26,25 +26,20 @@
*/
#ifndef _PAGESPAN_H
@@ -3312,8 +3368,9 @@
private:
WPXPropertyList mxPropList;
std::vector<DocumentElement *> * mpHeaderContent;
---- writerperfect/source/filter/SectionStyle.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/SectionStyle.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/SectionStyle.cxx writerperfect//source/filter/SectionStyle.cxx
+--- writerperfect//source/filter/SectionStyle.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/SectionStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -33,7 +33,7 @@
#ifdef _MSC_VER
@@ -3360,8 +3417,9 @@
pHandler->endElement("style:style");
}
---- writerperfect/source/filter/SectionStyle.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/SectionStyle.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/SectionStyle.hxx writerperfect//source/filter/SectionStyle.hxx
+--- writerperfect//source/filter/SectionStyle.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/SectionStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -21,19 +21,13 @@
*
*/
@@ -3396,8 +3454,9 @@
WPXPropertyListVector mColumns;
};
#endif
---- writerperfect/source/filter/Style.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/Style.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/Style.hxx writerperfect//source/filter/Style.hxx
+--- writerperfect//source/filter/Style.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/Style.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -21,19 +21,13 @@
*
*/
@@ -3428,8 +3487,9 @@
const WPXString &getName() const { return msName; }
private:
---- writerperfect/source/filter/TableStyle.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/TableStyle.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/TableStyle.cxx writerperfect//source/filter/TableStyle.cxx
+--- writerperfect//source/filter/TableStyle.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/TableStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -27,7 +27,6 @@
* Corel Corporation or Corel Corporation Limited."
*/
@@ -3546,8 +3606,9 @@
pHandler->endElement("style:style");
---- writerperfect/source/filter/TableStyle.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/TableStyle.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/TableStyle.hxx writerperfect//source/filter/TableStyle.hxx
+--- writerperfect//source/filter/TableStyle.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/TableStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -22,57 +22,53 @@
*
*/
@@ -3618,8 +3679,9 @@
WPXPropertyListVector mColumns;
std::vector<TableCellStyle *> mTableCellStyles;
std::vector<TableRowStyle *> mTableRowStyles;
---- writerperfect/source/filter/TextRunStyle.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/TextRunStyle.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/TextRunStyle.cxx writerperfect//source/filter/TextRunStyle.cxx
+--- writerperfect//source/filter/TextRunStyle.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/TextRunStyle.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -50,91 +50,95 @@
delete mpPropList;
}
@@ -3797,8 +3859,9 @@
+ pHandler->endElement("style:text-properties");
pHandler->endElement("style:style");
}
---- writerperfect/source/filter/TextRunStyle.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/TextRunStyle.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/TextRunStyle.hxx writerperfect//source/filter/TextRunStyle.hxx
+--- writerperfect//source/filter/TextRunStyle.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/TextRunStyle.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -29,26 +29,19 @@
#ifndef _TEXTRUNSTYLE_H
@@ -3836,16 +3899,18 @@
private:
WPXPropertyList mPropList;
---- writerperfect/source/filter/WriterProperties.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/filter/WriterProperties.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/filter/WriterProperties.hxx writerperfect//source/filter/WriterProperties.hxx
+--- writerperfect//source/filter/WriterProperties.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/filter/WriterProperties.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -32,5 +32,4 @@
#define IMP_DEFAULT_FONT_NAME "Times New Roman"
#define IMP_DEFAULT_FONT_SIZE 12.0f
#define IMP_DEFAULT_FONT_PITCH "variable"
-#define IMP_DEFAULT_FONT_COLOR (new RGBSColor(0x00,0x00,0x00,0x64))
#endif
---- writerperfect/source/stream/WPXSvStream.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/stream/WPXSvStream.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/stream/WPXSvStream.cxx writerperfect//source/stream/WPXSvStream.cxx
+--- writerperfect//source/stream/WPXSvStream.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/stream/WPXSvStream.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -9,7 +9,7 @@
using namespace ::com::sun::star::io;
@@ -3882,8 +3947,9 @@
-{
- return getDocumentOLEStream( "PerfectOffice_MAIN" );
-}
---- writerperfect/source/stream/WPXSvStream.h 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/stream/WPXSvStream.h 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/stream/WPXSvStream.h writerperfect//source/stream/WPXSvStream.h
+--- writerperfect//source/stream/WPXSvStream.h 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/stream/WPXSvStream.h 2008-11-17 22:07:19.000000000 +0100
@@ -12,13 +12,12 @@
#if defined _MSC_VER
#pragma warning( push, 1 )
@@ -3912,8 +3978,9 @@
virtual int seek(long offset, WPX_SEEK_TYPE seekType);
virtual long tell();
virtual bool atEOS();
---- writerperfect/source/wpdimp/makefile.mk 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpdimp/makefile.mk 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpdimp/makefile.mk writerperfect//source/wpdimp/makefile.mk
+--- writerperfect//source/wpdimp/makefile.mk 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpdimp/makefile.mk 2008-11-17 22:07:19.000000000 +0100
@@ -10,6 +10,10 @@
INCPRE+=$(LIBWPD_CFLAGS)
.ENDIF
@@ -3925,8 +3992,9 @@
.IF "$(SYSTEM_LIBWPS)" == "YES"
INCPRE+=$(LIBWPS_CFLAGS)
.ENDIF
---- writerperfect/source/wpdimp/WordPerfectCollector.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpdimp/WordPerfectCollector.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpdimp/WordPerfectCollector.cxx writerperfect//source/wpdimp/WordPerfectCollector.cxx
+--- writerperfect//source/wpdimp/WordPerfectCollector.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpdimp/WordPerfectCollector.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -35,8 +35,9 @@
#pragma warning( pop )
#endif
@@ -3955,8 +4023,9 @@
if (result != WPD_OK)
return false;
---- writerperfect/source/wpdimp/WordPerfectCollector.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpdimp/WordPerfectCollector.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpdimp/WordPerfectCollector.hxx writerperfect//source/wpdimp/WordPerfectCollector.hxx
+--- writerperfect//source/wpdimp/WordPerfectCollector.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpdimp/WordPerfectCollector.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -30,12 +30,16 @@
#define _WORDPERFECTCOLLECTOR_HXX
@@ -3976,8 +4045,9 @@
+ rtl::OString maUtf8Password;
};
#endif
---- writerperfect/source/wpdimp/WordPerfectImportFilter.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpdimp/WordPerfectImportFilter.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpdimp/WordPerfectImportFilter.cxx writerperfect//source/wpdimp/WordPerfectImportFilter.cxx
+--- writerperfect//source/wpdimp/WordPerfectImportFilter.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpdimp/WordPerfectImportFilter.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -29,27 +29,19 @@
*/
@@ -4228,8 +4298,9 @@
+{
+ return (cppu::OWeakObject*) new WordPerfectImportFilterDialog( rSMgr );
+}
---- writerperfect/source/wpdimp/WordPerfectImportFilter.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpdimp/WordPerfectImportFilter.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpdimp/WordPerfectImportFilter.hxx writerperfect//source/wpdimp/WordPerfectImportFilter.hxx
+--- writerperfect//source/wpdimp/WordPerfectImportFilter.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpdimp/WordPerfectImportFilter.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -32,9 +32,13 @@
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XImporter.hpp>
@@ -4305,8 +4376,9 @@
+ throw ( ::com::sun::star::uno::Exception );
+
#endif
---- writerperfect/source/wpdimp/wpft_genericfilter.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpdimp/wpft_genericfilter.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpdimp/wpft_genericfilter.cxx writerperfect//source/wpdimp/wpft_genericfilter.cxx
+--- writerperfect//source/wpdimp/wpft_genericfilter.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpdimp/wpft_genericfilter.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -55,14 +55,22 @@
{
sal_Int32 nPos = 0;
@@ -4364,8 +4436,9 @@
return pRet;
}
}
---- writerperfect/source/wpgimp/makefile.mk 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpgimp/makefile.mk 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpgimp/makefile.mk writerperfect//source/wpgimp/makefile.mk
+--- writerperfect//source/wpgimp/makefile.mk 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpgimp/makefile.mk 2008-11-17 22:07:19.000000000 +0100
@@ -12,12 +12,6 @@
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
.ENDIF
@@ -4387,8 +4460,9 @@
$(SLO)$/WPGImportFilter.obj \
$(SLO)$/wpgimport_genericfilter.obj
---- writerperfect/source/wpgimp/WPGImportFilter.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpgimp/WPGImportFilter.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpgimp/WPGImportFilter.cxx writerperfect//source/wpgimp/WPGImportFilter.cxx
+--- writerperfect//source/wpgimp/WPGImportFilter.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpgimp/WPGImportFilter.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -75,7 +75,7 @@
#endif
@@ -4432,8 +4506,9 @@
if (libwpg::WPGraphics::isSupported(input))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_WordPerfect_Graphics" ) );
---- writerperfect/source/wpsimp/MSWorksCollector.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpsimp/MSWorksCollector.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpsimp/MSWorksCollector.cxx writerperfect//source/wpsimp/MSWorksCollector.cxx
+--- writerperfect//source/wpsimp/MSWorksCollector.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpsimp/MSWorksCollector.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -29,7 +29,7 @@
#include "MSWorksCollector.hxx"
#include <libwps/WPSDocument.h>
@@ -4455,8 +4530,9 @@
if (result != WPS_OK)
return false;
---- writerperfect/source/wpsimp/MSWorksCollector.hxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpsimp/MSWorksCollector.hxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpsimp/MSWorksCollector.hxx writerperfect//source/wpsimp/MSWorksCollector.hxx
+--- writerperfect//source/wpsimp/MSWorksCollector.hxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpsimp/MSWorksCollector.hxx 2008-11-17 22:07:19.000000000 +0100
@@ -30,12 +30,13 @@
#define _MSWORKSCOLLECTOR_HXX
@@ -4473,8 +4549,9 @@
+ bool parseSourceDocument(WPXInputStream &input);
};
#endif
---- writerperfect/source/wpsimp/MSWorksImportFilter.cxx 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/source/wpsimp/MSWorksImportFilter.cxx 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//source/wpsimp/MSWorksImportFilter.cxx writerperfect//source/wpsimp/MSWorksImportFilter.cxx
+--- writerperfect//source/wpsimp/MSWorksImportFilter.cxx 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//source/wpsimp/MSWorksImportFilter.cxx 2008-11-17 22:07:19.000000000 +0100
@@ -127,7 +127,7 @@
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
@@ -4493,8 +4570,9 @@
if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence == WPS_CONFIDENCE_GOOD))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_MS_Works_Document" ) );
---- writerperfect/util/makefile.mk 2008-07-18 10:29:16.000000000 +0200
-+++ writerperfect/util/makefile.mk 2008-07-18 10:30:09.000000000 +0200
+diff -u -r -N writerperfect//util/makefile.mk writerperfect//util/makefile.mk
+--- writerperfect//util/makefile.mk 2008-11-17 22:06:28.000000000 +0100
++++ writerperfect//util/makefile.mk 2008-11-17 22:07:19.000000000 +0100
@@ -44,6 +44,8 @@
$(SOTLIB) \
$(SO2LIB) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
