37 files changed, 46 insertions, 64 deletions
diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
index a936e4e76442..e82fd0e7b0b1 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -36,19 +36,19 @@ $(eval $(call gb_StaticLibrary_use_api,writerperfect,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,writerperfect,\
-	writerperfect/source/filter/DocumentElement \
-	writerperfect/source/filter/DocumentHandler \
-	writerperfect/source/filter/FilterInternal \
-	writerperfect/source/filter/FontStyle \
-	writerperfect/source/filter/InternalHandler \
-	writerperfect/source/filter/ListStyle \
-	writerperfect/source/filter/OdgGenerator \
-	writerperfect/source/filter/OdtGenerator \
-	writerperfect/source/filter/PageSpan \
-	writerperfect/source/filter/SectionStyle \
-	writerperfect/source/filter/TableStyle \
-	writerperfect/source/filter/TextRunStyle \
-	writerperfect/source/stream/WPXSvStream \
+	writerperfect/source/common/DocumentElement \
+	writerperfect/source/common/DocumentHandler \
+	writerperfect/source/common/FilterInternal \
+	writerperfect/source/common/FontStyle \
+	writerperfect/source/common/InternalHandler \
+	writerperfect/source/common/ListStyle \
+	writerperfect/source/common/OdgGenerator \
+	writerperfect/source/common/OdtGenerator \
+	writerperfect/source/common/PageSpan \
+	writerperfect/source/common/SectionStyle \
+	writerperfect/source/common/TableStyle \
+	writerperfect/source/common/TextRunStyle \
+	writerperfect/source/common/WPXSvStream \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/source/filter/DocumentElement.cxx b/writerperfect/source/common/DocumentElement.cxx
index a396950973c3..a396950973c3 100644
--- a/writerperfect/source/filter/DocumentElement.cxx
+++ b/writerperfect/source/common/DocumentElement.cxx
diff --git a/writerperfect/source/filter/DocumentElement.hxx b/writerperfect/source/common/DocumentElement.hxx
index 3edf85ebce66..3edf85ebce66 100644
--- a/writerperfect/source/filter/DocumentElement.hxx
+++ b/writerperfect/source/common/DocumentElement.hxx
diff --git a/writerperfect/source/filter/DocumentHandler.cxx b/writerperfect/source/common/DocumentHandler.cxx
index f3c6a3574471..67d1b5e053ca 100644
--- a/writerperfect/source/filter/DocumentHandler.cxx
+++ b/writerperfect/source/common/DocumentHandler.cxx
@@ -15,8 +15,6 @@
 
 #include <xmloff/attrlist.hxx>
 
-// #define DEBUG_XML 1
-
 using com::sun::star::xml::sax::XAttributeList;
 
 DocumentHandler::DocumentHandler(Reference < XDocumentHandler > &xHandler) :
@@ -36,9 +34,6 @@ void DocumentHandler::endDocument()
 
 void DocumentHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
 {
-#ifdef DEBUG_XML
-    printf("<%s", psName);
-#endif
     SvXMLAttributeList *pAttrList = new SvXMLAttributeList();
     Reference < XAttributeList > xAttrList(pAttrList);
     WPXPropertyList::Iter i(xPropList);
@@ -49,33 +44,20 @@ void DocumentHandler::startElement(const char *psName, const WPXPropertyList &xP
         {
             pAttrList->AddAttribute(OUString::createFromAscii(i.key()),
                                     OUString::createFromAscii(i()->getStr().cstr()));
-#ifdef DEBUG_XML
-            printf(" %s=\"%s\"", i.key(), i()->getStr().cstr());
-#endif
         }
     }
-#ifdef DEBUG_XML
-    printf(">");
-#endif
 
     mxHandler->startElement(OUString::createFromAscii(psName), xAttrList);
 }
 
 void DocumentHandler::endElement(const char *psName)
 {
-#ifdef DEBUG_XML
-    printf("</%s>", psName);
-#endif
     mxHandler->endElement(OUString::createFromAscii(psName));
 }
 
 void DocumentHandler::characters(const WPXString &sCharacters)
 {
     OUString sCharU16(sCharacters.cstr(), strlen(sCharacters.cstr()), RTL_TEXTENCODING_UTF8);
-#ifdef DEBUG_XML
-    WPXString sEscapedCharacters(sCharacters, true);
-    printf("%s", sEscapedCharacters.cstr());
-#endif
     mxHandler->characters(sCharU16);
 }
 
diff --git a/writerperfect/source/filter/DocumentHandler.hxx b/writerperfect/source/common/DocumentHandler.hxx
index d781f30d56f1..381b091662f4 100644
--- a/writerperfect/source/filter/DocumentHandler.hxx
+++ b/writerperfect/source/common/DocumentHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OODOCUMENTHANDLER_HXX_
-#define _OODOCUMENTHANDLER_HXX_
+#ifndef _DOCUMENTHANDLER_HXX_
+#define _DOCUMENTHANDLER_HXX_
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
@@ -43,6 +43,6 @@ private:
     Reference < XDocumentHandler > mxHandler;
 };
 
-#endif // _OODOCUMENTHANDLER_HXX_
+#endif // _DOCUMENTHANDLER_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/FilterInternal.cxx b/writerperfect/source/common/FilterInternal.cxx
index 462747336798..462747336798 100644
--- a/writerperfect/source/filter/FilterInternal.cxx
+++ b/writerperfect/source/common/FilterInternal.cxx
diff --git a/writerperfect/source/filter/FilterInternal.hxx b/writerperfect/source/common/FilterInternal.hxx
index 6b5b0ab6fcbc..6b5b0ab6fcbc 100644
--- a/writerperfect/source/filter/FilterInternal.hxx
+++ b/writerperfect/source/common/FilterInternal.hxx
diff --git a/writerperfect/source/filter/FontStyle.cxx b/writerperfect/source/common/FontStyle.cxx
index bc1a8e3af21c..bc1a8e3af21c 100644
--- a/writerperfect/source/filter/FontStyle.cxx
+++ b/writerperfect/source/common/FontStyle.cxx
diff --git a/writerperfect/source/filter/FontStyle.hxx b/writerperfect/source/common/FontStyle.hxx
index b050cf6773e9..b050cf6773e9 100644
--- a/writerperfect/source/filter/FontStyle.hxx
+++ b/writerperfect/source/common/FontStyle.hxx
diff --git a/writerperfect/source/filter/InternalHandler.cxx b/writerperfect/source/common/InternalHandler.cxx
index a901336607ec..a901336607ec 100644
--- a/writerperfect/source/filter/InternalHandler.cxx
+++ b/writerperfect/source/common/InternalHandler.cxx
diff --git a/writerperfect/source/filter/InternalHandler.hxx b/writerperfect/source/common/InternalHandler.hxx
index a07e83a977d9..a07e83a977d9 100644
--- a/writerperfect/source/filter/InternalHandler.hxx
+++ b/writerperfect/source/common/InternalHandler.hxx
diff --git a/writerperfect/source/filter/ListStyle.cxx b/writerperfect/source/common/ListStyle.cxx
index 1b6cf5c7181a..1b6cf5c7181a 100644
--- a/writerperfect/source/filter/ListStyle.cxx
+++ b/writerperfect/source/common/ListStyle.cxx
diff --git a/writerperfect/source/filter/ListStyle.hxx b/writerperfect/source/common/ListStyle.hxx
index 53ee67ed33b4..53ee67ed33b4 100644
--- a/writerperfect/source/filter/ListStyle.hxx
+++ b/writerperfect/source/common/ListStyle.hxx
diff --git a/writerperfect/source/filter/OdfDocumentHandler.hxx b/writerperfect/source/common/OdfDocumentHandler.hxx
index 886e9b702bf5..886e9b702bf5 100644
--- a/writerperfect/source/filter/OdfDocumentHandler.hxx
+++ b/writerperfect/source/common/OdfDocumentHandler.hxx
diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/common/OdgGenerator.cxx
index d166a09bbda5..d166a09bbda5 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/common/OdgGenerator.cxx
diff --git a/writerperfect/source/filter/OdgGenerator.hxx b/writerperfect/source/common/OdgGenerator.hxx
index 589e66667707..589e66667707 100644
--- a/writerperfect/source/filter/OdgGenerator.hxx
+++ b/writerperfect/source/common/OdgGenerator.hxx
diff --git a/writerperfect/source/filter/OdtGenerator.cxx b/writerperfect/source/common/OdtGenerator.cxx
index ba14e921b989..ba14e921b989 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/common/OdtGenerator.cxx
diff --git a/writerperfect/source/filter/OdtGenerator.hxx b/writerperfect/source/common/OdtGenerator.hxx
index 7876e39a47e7..7876e39a47e7 100644
--- a/writerperfect/source/filter/OdtGenerator.hxx
+++ b/writerperfect/source/common/OdtGenerator.hxx
diff --git a/writerperfect/source/filter/PageSpan.cxx b/writerperfect/source/common/PageSpan.cxx
index f6626481bf16..f6626481bf16 100644
--- a/writerperfect/source/filter/PageSpan.cxx
+++ b/writerperfect/source/common/PageSpan.cxx
diff --git a/writerperfect/source/filter/PageSpan.hxx b/writerperfect/source/common/PageSpan.hxx
index 0c7f72df82c5..0c7f72df82c5 100644
--- a/writerperfect/source/filter/PageSpan.hxx
+++ b/writerperfect/source/common/PageSpan.hxx
diff --git a/writerperfect/source/filter/SectionStyle.cxx b/writerperfect/source/common/SectionStyle.cxx
index 5f8c17138d6c..5f8c17138d6c 100644
--- a/writerperfect/source/filter/SectionStyle.cxx
+++ b/writerperfect/source/common/SectionStyle.cxx
diff --git a/writerperfect/source/filter/SectionStyle.hxx b/writerperfect/source/common/SectionStyle.hxx
index d06a60604360..d06a60604360 100644
--- a/writerperfect/source/filter/SectionStyle.hxx
+++ b/writerperfect/source/common/SectionStyle.hxx
diff --git a/writerperfect/source/filter/Style.hxx b/writerperfect/source/common/Style.hxx
index 4c8cf5b82300..4c8cf5b82300 100644
--- a/writerperfect/source/filter/Style.hxx
+++ b/writerperfect/source/common/Style.hxx
diff --git a/writerperfect/source/filter/TableStyle.cxx b/writerperfect/source/common/TableStyle.cxx
index 856f578ff30e..856f578ff30e 100644
--- a/writerperfect/source/filter/TableStyle.cxx
+++ b/writerperfect/source/common/TableStyle.cxx
diff --git a/writerperfect/source/filter/TableStyle.hxx b/writerperfect/source/common/TableStyle.hxx
index 8f1e83094eeb..8f1e83094eeb 100644
--- a/writerperfect/source/filter/TableStyle.hxx
+++ b/writerperfect/source/common/TableStyle.hxx
diff --git a/writerperfect/source/filter/TextRunStyle.cxx b/writerperfect/source/common/TextRunStyle.cxx
index 8bb34efc5518..8bb34efc5518 100644
--- a/writerperfect/source/filter/TextRunStyle.cxx
+++ b/writerperfect/source/common/TextRunStyle.cxx
diff --git a/writerperfect/source/filter/TextRunStyle.hxx b/writerperfect/source/common/TextRunStyle.hxx
index c8d3a26b70c1..c8d3a26b70c1 100644
--- a/writerperfect/source/filter/TextRunStyle.hxx
+++ b/writerperfect/source/common/TextRunStyle.hxx
diff --git a/writerperfect/source/stream/WPXSvStream.cxx b/writerperfect/source/common/WPXSvStream.cxx
index 81d6b1bb00b4..234b3993a21e 100644
--- a/writerperfect/source/stream/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "WPXSvStream.h"
-#include "filter/FilterInternal.hxx"
+#include "WPXSvStream.hxx"
+#include "FilterInternal.hxx"
 #include <tools/stream.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/writerperfect/source/stream/WPXSvStream.h b/writerperfect/source/common/WPXSvStream.hxx
index d104c4b341cc..d104c4b341cc 100644
--- a/writerperfect/source/stream/WPXSvStream.h
+++ b/writerperfect/source/common/WPXSvStream.hxx
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index 1a66c98fbce0..10cdcad56ca1 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -26,10 +26,10 @@
 #include <xmloff/attrlist.hxx>
 
 #include <libcdr/libcdr.h>
-#include "filter/DocumentHandler.hxx"
-#include "filter/OdgGenerator.hxx"
+#include "common/DocumentHandler.hxx"
+#include "common/OdgGenerator.hxx"
 #include "CDRImportFilter.hxx"
-#include "stream/WPXSvStream.h"
+#include "common/WPXSvStream.hxx"
 
 #include <iostream>
 
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index 60653542dfc3..7290acd45913 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -26,10 +26,10 @@
 #include <xmloff/attrlist.hxx>
 
 #include <libcdr/libcdr.h>
-#include "filter/DocumentHandler.hxx"
-#include "filter/OdgGenerator.hxx"
+#include "common/DocumentHandler.hxx"
+#include "common/OdgGenerator.hxx"
 #include "CMXImportFilter.hxx"
-#include "stream/WPXSvStream.h"
+#include "common/WPXSvStream.hxx"
 
 #include <iostream>
 
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 2ad210b26ff8..820016026b40 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -22,10 +22,10 @@
 #include <xmloff/attrlist.hxx>
 
 #include <libmspub/libmspub.h>
-#include "filter/DocumentHandler.hxx"
-#include "filter/OdgGenerator.hxx"
+#include "common/DocumentHandler.hxx"
+#include "common/OdgGenerator.hxx"
 #include "MSPUBImportFilter.hxx"
-#include "stream/WPXSvStream.h"
+#include "common/WPXSvStream.hxx"
 
 #include <iostream>
 
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index d2b0dc03b731..11d2c0c2f7fa 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -22,10 +22,10 @@
 #include <xmloff/attrlist.hxx>
 
 #include <libvisio/libvisio.h>
-#include "filter/DocumentHandler.hxx"
-#include "filter/OdgGenerator.hxx"
+#include "common/DocumentHandler.hxx"
+#include "common/OdgGenerator.hxx"
 #include "VisioImportFilter.hxx"
-#include "stream/WPXSvStream.h"
+#include "common/WPXSvStream.hxx"
 
 #include <iostream>
 
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index d7629c5c64ea..f29ff5d448a4 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -27,10 +27,10 @@
 #include <comphelper/componentcontext.hxx>
 #include <xmloff/attrlist.hxx>
 
-#include "filter/DocumentHandler.hxx"
-#include "filter/OdgGenerator.hxx"
+#include "common/DocumentHandler.hxx"
+#include "common/OdgGenerator.hxx"
 #include "WPGImportFilter.hxx"
-#include "stream/WPXSvStream.h"
+#include "common/WPXSvStream.hxx"
 
 #include <iostream>
 
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 27112eb4528f..c1d63c7317c8 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -26,11 +26,11 @@
 
 #include <libwps/libwps.h>
 
-#include "filter/FilterInternal.hxx"
-#include "filter/DocumentHandler.hxx"
-#include "filter/OdtGenerator.hxx"
+#include "common/FilterInternal.hxx"
+#include "common/DocumentHandler.hxx"
+#include "common/OdtGenerator.hxx"
 #include "MSWorksImportFilter.hxx"
-#include "stream/WPXSvStream.h"
+#include "common/WPXSvStream.hxx"
 
 #include <iostream>
 
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
index b00accdebff1..ebd1b1959501 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -26,11 +26,11 @@
 
 #include <libmwaw/libmwaw.hxx>
 
-#include "filter/FilterInternal.hxx"
-#include "filter/DocumentHandler.hxx"
-#include "filter/OdtGenerator.hxx"
+#include "common/FilterInternal.hxx"
+#include "common/DocumentHandler.hxx"
+#include "common/OdtGenerator.hxx"
 #include "MWAWImportFilter.hxx"
-#include "stream/WPXSvStream.h"
+#include "common/WPXSvStream.hxx"
 
 #include <iostream>
 
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index d5cd0ca0682d..1c1e56c4e0d4 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -27,11 +27,11 @@
 
 #include <libwpd/libwpd.h>
 
-#include "filter/FilterInternal.hxx"
-#include "filter/DocumentHandler.hxx"
-#include "filter/OdgGenerator.hxx"
-#include "filter/OdtGenerator.hxx"
-#include "stream/WPXSvStream.h"
+#include "common/FilterInternal.hxx"
+#include "common/DocumentHandler.hxx"
+#include "common/OdgGenerator.hxx"
+#include "common/OdtGenerator.hxx"
+#include "common/WPXSvStream.hxx"
 #include "WordPerfectImportFilter.hxx"
 
 using ::ucbhelper::Content;