Merge branch 'master' into feature/gnumake4

Conflicts:
filter/source/config/cache/filtercache.cxx
filter/source/odfflatxml/makefile.mk
oox/Library_oox.mk
oox/Makefile
oox/Module_oox.mk
oox/Package_generated.mk
oox/Package_inc.mk
oox/prj/build.lst
oox/prj/d.lst
oox/prj/makefile.mk
oox/source/dump/makefile.mk
unoxml/Library_unordf.mk
unoxml/Library_unoxml.mk
writerfilter/CppunitTest_writerfilter_doctok.mk
writerfilter/Library_writerfilter.mk
writerfilter/Module_writerfilter.mk
writerfilter/Package_inc.mk
writerfilter/inc/resourcemodel/TagLogger.hxx
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
writerfilter/prj/build.lst
writerfilter/prj/makefile.mk
writerfilter/qa/complex/ooxml/makefile.mk
writerfilter/qa/cppunittests/doctok/makefile.mk
writerfilter/qa/cppunittests/doctok/testdoctok.cxx
writerfilter/qa/cppunittests/xxml/testXXML.cxx
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/FontTable.cxx
writerfilter/source/dmapper/GraphicHelpers.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyMap.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/dmapper/StyleSheetTable.cxx
writerfilter/source/dmapper/TablePropertiesHandler.cxx
writerfilter/source/dmapper/TblStylePrHandler.cxx
writerfilter/source/dmapper/ThemeTable.cxx
writerfilter/source/doctok/WW8DocumentImpl.cxx
writerfilter/source/doctok/resourcesimpl.xsl
writerfilter/source/filter/WriterFilter.cxx
writerfilter/source/generated.mk
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
writerfilter/source/ooxml/OOXMLFactory.cxx
writerfilter/source/ooxml/OOXMLFactory.hxx
writerfilter/source/ooxml/OOXMLStreamImpl.cxx
writerfilter/source/ooxml/RefAndPointer.hxx
writerfilter/source/resourcemodel/TagLogger.cxx
writerfilter/unocomponent/component.cxx
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx

20 files changed, 328 insertions, 570 deletions

diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
index fa3bb59e766c..27b9feef32a5 100644
--- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
+++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // autogenerated file with codegen.pl
 
 #include <sal/cppunit.h>
@@ -72,8 +73,8 @@ public:
             {
                 uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
                     xNameContainer(xFactory->createInstanceWithContext
-                                   (::rtl::OUString::createFromAscii
-                                    ("com.sun.star.ucb.SimpleFileAccess" ),
+                                       (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                        ("com.sun.star.ucb.SimpleFileAccess" )),
                                     xComponentContext), uno::UNO_QUERY );
 
                 if (xNameContainer.is())
@@ -97,9 +98,7 @@ public:
             rtl_uString *dir=NULL;
             osl_getProcessWorkingDir(&dir);
             rtl_uString *fname=NULL;
-            //rtl_uString_newFromAscii(&fname, "/OpenDocument-v1.doc");
             rtl_uString_newFromAscii(&fname, "/test.doc");
-            //rtl_uString_newFromAscii(&fname, "/numbers.doc");
             rtl_uString *absfile=NULL;
             rtl_uString_newConcat(&absfile, dir, fname);
 
@@ -124,13 +123,14 @@ public:
 
             pDocument.reset(WW8DocumentFactory::createDocument(pStream));
         }
-        catch (writerfilter::Exception e)
+            catch (doctok::Exception)
         {
             clog << "Exception!!" << endl;
         }
 
         CPPUNIT_ASSERT_MESSAGE("creating document failed",
                                pDocument != NULL);
+            catch (doctok::Exception)
     }
 
     void testEvents()
@@ -141,7 +141,7 @@ public:
 
             pDocument->resolve(*pStream);
         }
-        catch (writerfilter::Exception e)
+            catch (doctok::Exception)
         {
             clog << "Exception!!" << endl;
         }
@@ -173,3 +173,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(testdoctok::test, "doctok");
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx.orig b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx.orig
new file mode 100644
index 000000000000..6912a8da8c40
--- /dev/null
+++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx.orig
@@ -0,0 +1,288 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+// autogenerated file with codegen.pl
+
+#include <sal/cppunit.h>
+#include <osl/process.h>
+#include <cppuhelper/bootstrap.hxx>
+#include <ucbhelper/contentbroker.hxx>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <iostream>
+
+#include <doctok/WW8Document.hxx>
+
+namespace testdoctok
+{
+using namespace ::std;
+using namespace ::com::sun::star;
+using namespace ::writerfilter::doctok;
+
+uno::Reference<io::XInputStream> xStream;
+uno::Reference<uno::XComponentContext> xContext;
+WW8Document::Pointer_t pDocument;
+uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess;
+
+class test : public CppUnit::TestFixture
+{
+
+public:
+    // initialise your test code values here.
+    void setUp()
+    {
+    }
+
+    void tearDown()
+    {
+    }
+
+    void testInitUno()
+    {
+        bool bResult = false;
+
+        // initialise UCB-Broker
+        uno::Reference<uno::XComponentContext>
+            xComponentContext
+            (::cppu::defaultBootstrap_InitialComponentContext());
+        OSL_ASSERT( xComponentContext.is() );
+
+        xContext = xComponentContext;
+
+        uno::Reference<lang::XMultiComponentFactory>
+            xFactory(xComponentContext->getServiceManager() );
+        OSL_ASSERT(xFactory.is());
+
+        uno::Sequence<uno::Any> aUcbInitSequence(2);
+        aUcbInitSequence[0] <<=
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
+        aUcbInitSequence[1] <<=
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+
+        uno::Reference<lang::XMultiServiceFactory>
+            xServiceFactory(xFactory, uno::UNO_QUERY);
+        OSL_ASSERT( xServiceFactory.is() );
+
+        if (xServiceFactory.is())
+        {
+            sal_Bool bRet =
+                ::ucbhelper::ContentBroker::initialize(xServiceFactory,
+                                                       aUcbInitSequence);
+
+            OSL_ASSERT(bRet);
+            if (bRet)
+            {
+                uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
+                    xNameContainer(xFactory->createInstanceWithContext
+                                   (::rtl::OUString::createFromAscii
+                                    ("com.sun.star.ucb.SimpleFileAccess" ),
+                                    xComponentContext), uno::UNO_QUERY );
+
+                if (xNameContainer.is())
+                {
+<<<<<<< HEAD
+                    xSimpleFileAccess = xNameContainer;
+
+                    bResult = true;
+=======
+                    uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
+                        xNameContainer(xFactory->createInstanceWithContext
+                                       (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                        ("com.sun.star.ucb.SimpleFileAccess" )),
+                                        xComponentContext), uno::UNO_QUERY );
+
+                    if (xNameContainer.is())
+                    {
+                        xSimpleFileAccess = xNameContainer;
+
+                        bResult = true;
+                    }
+>>>>>>> master
+                }
+            }
+        }
+
+        CPPUNIT_ASSERT_MESSAGE("UNO initialization failed",
+                               bResult);
+    }
+
+    // insert your test code here.
+    void testOpenFile()
+    {
+        try
+        {
+            rtl_uString *dir=NULL;
+            osl_getProcessWorkingDir(&dir);
+            rtl_uString *fname=NULL;
+            //rtl_uString_newFromAscii(&fname, "/OpenDocument-v1.doc");
+            rtl_uString_newFromAscii(&fname, "/test.doc");
+            //rtl_uString_newFromAscii(&fname, "/numbers.doc");
+            rtl_uString *absfile=NULL;
+            rtl_uString_newConcat(&absfile, dir, fname);
+
+            rtl::OUString sInputFileURL( absfile );
+
+            for (sal_Int32 n = 0; n < sInputFileURL.getLength(); ++n)
+            {
+<<<<<<< HEAD
+                sal_uChar nC = sInputFileURL[n];
+=======
+                rtl_uString *dir=NULL;
+                osl_getProcessWorkingDir(&dir);
+                rtl_uString *fname=NULL;
+                rtl_uString_newFromAscii(&fname, "/test.doc");
+                rtl_uString *absfile=NULL;
+                rtl_uString_newConcat(&absfile, dir, fname);
+
+                rtl::OUString sInputFileURL( absfile );
+
+                for (sal_uInt32 n = 0; n < sInputFileURL.getLength(); ++n)
+                {
+                    sal_uChar nC = sInputFileURL[n];
+
+                    if (nC < 0xff && isprint(nC))
+                        clog << static_cast<char>(nC);
+                    else
+                        clog << ".";
+                }
+>>>>>>> master
+
+                if (nC < 0xff && isprint(nC))
+                    clog << static_cast<char>(nC);
+                else
+                    clog << ".";
+            }
+
+            clog << endl;
+
+            xStream = xSimpleFileAccess->openFileRead(sInputFileURL);
+
+<<<<<<< HEAD
+            WW8Stream::Pointer_t pStream =
+                WW8DocumentFactory::createStream(xContext, xStream);
+=======
+                pDocument = WW8DocumentFactory::createDocument(pStream);
+            }
+            catch (doctok::Exception)
+            {
+                clog << "Exception!!" << endl;
+            }
+>>>>>>> master
+
+            pDocument.reset(WW8DocumentFactory::createDocument(pStream));
+        }
+        catch (writerfilter::Exception e)
+        {
+<<<<<<< HEAD
+            clog << "Exception!!" << endl;
+=======
+#endif
+            sal_uInt32 nResult = 0;
+
+            try
+            {
+                WW8DocumentIterator::Pointer_t pIt = pDocument->begin();
+                WW8DocumentIterator::Pointer_t pItEnd = pDocument->end();
+
+                while (! pIt->equal(*pItEnd))
+                {
+                    pIt->dump(clog);
+
+                    clog << endl;
+
+                    WW8PropertySet::Pointer_t pAttrs = pIt->getProperties();
+
+                    if (pAttrs != NULL)
+                    {
+                        pAttrs->dump(clog);
+                    }
+
+                    pIt->getText().dump(clog);
+                    ++(*pIt);
+                    ++nResult;
+                }
+            }
+            catch (doctok::Exception)
+            {
+                clog << "Exception!!" << endl;
+            }
+
+            char sBuffer[256];
+            snprintf(sBuffer, 255, "%d", nResult);
+            clog << "Iterator steps:" << sBuffer << endl;
+
+            CPPUNIT_ASSERT_MESSAGE("traversing document failed",
+                                   nResult > 0);
+>>>>>>> master
+        }
+
+        CPPUNIT_ASSERT_MESSAGE("creating document failed",
+                               pDocument != NULL);
+    }
+
+    void testEvents()
+    {
+        try
+        {
+            ::writerfilter::Stream::Pointer_t pStream = ::writerfilter::createStreamHandler();
+
+<<<<<<< HEAD
+            pDocument->resolve(*pStream);
+=======
+                pDocument->resolve(*pStream);
+            }
+            catch (doctok::Exception)
+            {
+                clog << "Exception!!" << endl;
+            }
+>>>>>>> master
+        }
+        catch (writerfilter::Exception e)
+        {
+            clog << "Exception!!" << endl;
+        }
+    }
+
+    void testEnd()
+    {
+        ::ucbhelper::ContentBroker::deinitialize();
+    }
+
+<<<<<<< HEAD
+    // Change the following lines only, if you add, remove or rename 
+    // member functions of the current class, 
+    // because these macros are need by auto register mechanism.
+
+    CPPUNIT_TEST_SUITE(test);
+    CPPUNIT_TEST(testInitUno);
+    CPPUNIT_TEST(testOpenFile);
+    CPPUNIT_TEST(testEvents);
+    CPPUNIT_TEST(testEnd);        
+    CPPUNIT_TEST_SUITE_END();
+}; // class test
+
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(testdoctok::test, "doctok");
+=======
+        // Change the following lines only, if you add, remove or rename 
+        // member functions of the current class, 
+        // because these macros are need by auto register mechanism.
+
+        CPPUNIT_TEST_SUITE(test);
+        CPPUNIT_TEST(testInitUno);
+        CPPUNIT_TEST(testOpenFile);
+        CPPUNIT_TEST(testEvents);
+        CPPUNIT_TEST(testEnd);        
+        CPPUNIT_TEST_SUITE_END();
+    }; // class test
+
+    // -----------------------------------------------------------------------------
+    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(testdoctok::test, "doctok");
+>>>>>>> master
+} // namespace doctok
+
+
+// -----------------------------------------------------------------------------
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx b/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx
index 996112740fac..2fb2a73ecbc5 100644
--- a/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,8 +83,6 @@ namespace util
 
   void ExternalViewLoggerImpl::endTree()
   {
-    //dumpNodeContainer(mFileName + string(".dmp"));
-
     mFile << "digraph {" << endl;
     mFile << "Root [shape=box, color=grey];" << endl;
 
@@ -201,3 +200,4 @@ namespace util
 
 } // namespace util
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.hxx b/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.hxx
index dfa5dd736b41..9ef73b05127d 100644
--- a/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.hxx
+++ b/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
 #ifndef INCLUDED_EXTERNALVIEWLOGGER_HXX
 #define INCLUDED_EXTERNALVIEWLOGGER_HXX
 
-#ifndef INCLUDED_LOGGER_HXX
 #include <odiapi/props/Logger.hxx>
-#endif
 
 #include <fstream>
 #include <stack>
@@ -88,3 +87,5 @@ namespace util {
 } // namespace util
 
 #endif // INCLUDED_LOGGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx b/writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx
index 28b4b3776fe1..e945711ea43a 100644
--- a/writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,4 @@ namespace util
 
 } // namespace util
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.hxx b/writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.hxx
index c5ec03724c12..12bc69d1591a 100644
--- a/writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.hxx
+++ b/writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ private:
 } // namespace util
 
 #endif // INCLUDED_LOGGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/odiapi/makefile.mk b/writerfilter/qa/cppunittests/odiapi/makefile.mk
index 6fc9adcd2f51..c8fddac20cd0 100644
--- a/writerfilter/qa/cppunittests/odiapi/makefile.mk
+++ b/writerfilter/qa/cppunittests/odiapi/makefile.mk
@@ -36,13 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(GUI)" == "WNT"
-    #CFLAGS+=/Ob1
-.ENDIF
-
 SHL1OBJS=\
     $(SLO)$/testProperty.obj \
     $(SLO)$/FileLoggerImpl.obj\
@@ -50,7 +43,7 @@ SHL1OBJS=\
     $(SLO)$/testCore.obj
 
 SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(TESTSHL2LIB) $(CPPUNITLIB)
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+=   $(LB)$/iodiapi.lib
@@ -62,14 +55,10 @@ SHL1STDLIBS+=$(LB)$/libodiapi.dylib
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
 DEF1NAME    =$(SHL1TARGET)
 
 SHL1VERSIONMAP = export.map
 
-# END ------------------------------------------------------------------
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/writerfilter/qa/cppunittests/odiapi/testCore.cxx b/writerfilter/qa/cppunittests/odiapi/testCore.cxx
index 774cc4722df4..a88f42472d5f 100644
--- a/writerfilter/qa/cppunittests/odiapi/testCore.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testCore.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -170,3 +171,5 @@ public:
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestCore, "TestCore");
 
 //NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
index 621dda65cfa3..3ec344848b74 100644
--- a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,10 @@ using namespace writerfilter;
 using namespace std;
 using namespace util;
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
 /** Helper function, get a temporary file name
  */
@@ -48,7 +52,7 @@ OString getTempFileName(const OUString& fileName)
   OUString ousTmpUrl;
   FileBase::getTempDirURL(ousTmpUrl);
   if (!ousTmpUrl.endsWithIgnoreAsciiCaseAsciiL("/", 1))
-    ousTmpUrl += OUString::createFromAscii("/");
+    ousTmpUrl += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
   ousTmpUrl += fileName;
 
   OUString sysTmpPath;
@@ -272,12 +276,12 @@ public:
 
         pool->insert(ps4);
 
-        OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropertyPool_int.dot"));
+        OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropertyPool_int.dot")));
         printf("Pool dump: %s\n", tmpFileName.getStr());
         FileLoggerImpl fl(tmpFileName.getStr());
         pool->dump(&fl);
 
-        OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testPropertyPool_ext.dot"));
+        OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropertyPool_ext.dot")));
         printf("Pool dump: %s\n", tmpFileName2.getStr());
         ExternalViewLoggerImpl evl(tmpFileName2.getStr());
         pool->dump(&evl);
@@ -372,12 +376,12 @@ public:
 
         CPPUNIT_ASSERT_MESSAGE("paraProps == failed failed", paraProps == paragraphProps);
 
-        OString tmpFileName = getTempFileName(OUString::createFromAscii("testComplexParaProps_int.dot"));
+        OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testComplexParaProps_int.dot")));
         printf("Pool dump: %s\n", tmpFileName.getStr());
         FileLoggerImpl fl(tmpFileName.getStr());
         pool->dump(&fl);
 
-        OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testComplexParaProps_ext.dot"));
+        OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testComplexParaProps_ext.dot")));
         printf("Pool dump: %s\n", tmpFileName2.getStr());
         ExternalViewLoggerImpl evl(tmpFileName2.getStr());
         pool->dump(&evl);
@@ -504,21 +508,21 @@ public:
             pb2->insert(createStringProperty(NS_style::LN_font_face, "Roman"));
             PropertyPoolHandle_Pointer_t ph2 = pool->insert(pb2);
 
-            OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_1.dot"));
+            OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_1.dot")));
             printf("Pool dump: %s\n", tmpFileName.getStr());
             FileLoggerImpl fl(tmpFileName.getStr());
             pool->dump(&fl);
 
         }
 
-        OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_2.dot"));
+        OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_2.dot")));
         printf("Pool dump: %s\n", tmpFileName.getStr());
         FileLoggerImpl fl(tmpFileName.getStr());
         pool->dump(&fl);
 
         pool->garbageCollection();
 
-        OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_after.dot"));
+        OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_after.dot")));
         printf("Pool dump: %s\n", tmpFileName2.getStr());
         FileLoggerImpl fl2(tmpFileName2.getStr());
         pool->dump(&fl2);
@@ -680,3 +684,5 @@ public:
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestProperty, "TestProperty");
 
 NOADDITIONAL;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/qname/makefile.mk b/writerfilter/qa/cppunittests/qname/makefile.mk
index 2f51eb3844c7..9877e271d821 100644
--- a/writerfilter/qa/cppunittests/qname/makefile.mk
+++ b/writerfilter/qa/cppunittests/qname/makefile.mk
@@ -49,7 +49,7 @@ SHL1OBJS=\
 
 SHL1TARGET=$(TARGET)
 
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB)
 
 .IF "$(GUI)" == "WNT"
 SHL1STDLIBS+=   $(LB)$/iodiapi.lib
diff --git a/writerfilter/qa/cppunittests/qname/testQName.cxx b/writerfilter/qa/cppunittests/qname/testQName.cxx
index 1c629666d8e6..2a2b26e8bcf4 100644
--- a/writerfilter/qa/cppunittests/qname/testQName.cxx
+++ b/writerfilter/qa/cppunittests/qname/testQName.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,7 @@
 #include <rtl/string.hxx>
 #include <rtl/random.h>
 #include <osl/time.h>
-#include <hash_set>
+#include <boost/unordered_set.hpp>
 #include <stdexcept>
 
 
@@ -61,7 +62,6 @@ public:
             id%=QName::tokenizer().getQNames();
             const sal_Char *ln=QName::serializer().getLocalName((QName_t)id);
             const sal_Char *ns=QName::serializer().getNamespaceUri((QName_t)id);
-//          printf("%i \"%s\" \"%s\"\n", i, ns, ln);
             testAdd(ns, ln);
         }
         rtl_random_destroyPool(rndPool);
@@ -7533,3 +7533,4 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestQName, "TestQName");
 
 NOADDITIONAL;
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/sl/export.map b/writerfilter/qa/cppunittests/sl/export.map
deleted file mode 100644
index 7321bbca16ad..000000000000
--- a/writerfilter/qa/cppunittests/sl/export.map
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        registerAllTestFunction;
-
-    local:
-        *;
-};
diff --git a/writerfilter/qa/cppunittests/sl/helloworld.odt.flat.xml b/writerfilter/qa/cppunittests/sl/helloworld.odt.flat.xml
deleted file mode 100644
index 85ad3557c396..000000000000
--- a/writerfilter/qa/cppunittests/sl/helloworld.odt.flat.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" office:version="1.0" office:mimetype="application/x-vnd.oasis.openoffice.text"><office:meta><meta:generator>StarOffice/8$Win32 OpenOffice.org_project/680m145$Build-8989</meta:generator><meta:creation-date>2006-02-10T18:59:19</meta:creation-date><dc:date>2006-02-10T19:02:26</dc:date><dc:language>de-DE</dc:language><meta:editing-cycles>2</meta:editing-cycles><meta:editing-duration>PT3M12S</meta:editing-duration><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/><meta:document-statistic meta:table-count="0" meta:image-count="0" meta:
-bject-count="0" meta:page-count="1" meta:paragraph-count="1" meta:word-count="2" meta:character-count="11"/></office:meta><office:settings><config:config-item-set config:name="ooo:view-settings"><config:config-item config:name="ViewAreaTop" config:type="int">0</config:config-item><config:config-item config:name="ViewAreaLeft" config:type="int">0</config:config-item><config:config-item config:name="ViewAreaWidth" config:type="int">15965</config:config-item><config:config-item config:name="ViewAreaHeight" config:type="int">8363</config:config-item><config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item><config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item><config:config-item-map-indexed config:name="Views"><config:config-item-map-entry><config:config-item config:name="ViewId" config:type="string">view2</config:config-item><config:config-item config:name="ViewLeft" config:type="int">6137</config:config-item><config:config-item config:name="ViewTop" config:type="int">3002</config:config-item><config:config-item config:name="VisibleLeft" config:type="int">0</config:config-item><config:config-item config:name="VisibleTop" config:type="int">0</config:config-item><config:config-item config:name="VisibleRight" config:type="int">15963</config:config-item><config:config-item config:name="VisibleBottom" config:type="int">8361</config:config-item><config:config-item config:name="ZoomType" config:type="short">0</config:config-item><config:config-item config:name="ZoomFactor" config:type="short">150</config:config-item><config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item></config:config-item-map-entry></config:config-item-map-indexed></config:config-item-set><config:config-item-set config:name="ooo:configuration-settings"><config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item><config:config-item config:name="PrintReversed" config:type="boolean">false</co
-fig:config-item><config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item><config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item><config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item><config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item><config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item><config:config-item config:name="UpdateFromTemplate" config:type="boolean">false</config:config-item><config:config-item config:name="PrintPaperFromSetup" config:type="boolean">false</config:config-item><config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item><config:config-item config:name="PrintLeftPages" config:type="boolean">true</config:config-item><config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/><config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item><config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item><config:config-item config:name="PrintControls" config:type="boolean">true</config:config-item><config:config-item config:name="PrinterSetup" config:type="base64Binary"/><config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item><config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item><config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item><config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item><config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item><config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item><config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</con
-ig:config-item><config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item><config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item><config:config-item config:name="AlignTatopPosition" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseDataSource" config:type="string"/><config:config-item config:name="PrinterName" config:type="string"/><config:config-item config:name="PrintFaxName" config:type="string"/><config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item><config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item><config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item><config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item><config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item><config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item><config:config-item config:name="DoNotResetParaAttrsForNumFont" config:type="boolean">false</config:config-item><config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item><config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item><config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item><config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item><config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item><config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item><config:config-item config:name="UseOldN
-mbering" config:type="boolean">false</config:config-item><config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseCommand" config:type="string"/><config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item><config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item></config:config-item-set></office:settings><office:scripts><office:script script:language="ooo:Basic">
-   <ooo:libraries>
-    <ooo:library-embedded ooo:name="Standard"/>
-   </ooo:libraries></office:script></office:scripts><office:font-face-decls><style:font-face style:name="Tahoma1" svg:font-family="Tahoma"/><style:font-face style:name="Andale Sans UI" svg:font-family="'Andale Sans UI'" style:font-pitch="variable"/><style:font-face style:name="MS Mincho" svg:font-family="'MS Mincho'" style:font-pitch="variable"/><style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-pitch="variable"/><style:font-face style:name="Thorndale" svg:font-family="Thorndale" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-face style:name="Albany" svg:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-face-decls><office:styles><style:default-style style:family="graphic"><style:graphic-properties draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/><style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false"><!--<style:tab-stops/>--></style:paragraph-properties><style:text-properties style:use-window-font-color="true" fo:font-size="12pt" fo:language="de" fo:country="DE" style:font-size-asian="12pt" style:language-asian="none" style:country-asian="none" style:font-size-complex="12pt" style:language-complex="none" style:country-complex="none"/></style:default-style><style:default-style style:family="paragraph"><style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/><style:text-properties style:use-window-font-color="true" style:font-name="Thorndale" fo:font-size="12pt" fo:language="de" fo:country="DE" style:font-name-asian="Andale Sans UI" style:
-ont-size-asian="12pt" style:language-asian="none" style:country-asian="none" style:font-name-complex="Tahoma" style:font-size-complex="12pt" style:language-complex="none" style:country-complex="none" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/></style:default-style><style:default-style style:family="table"><style:table-properties table:border-model="collapsing"/></style:default-style><style:default-style style:family="table-row"><style:table-row-properties fo:keep-together="auto"/></style:default-style><style:style style:name="Standard" style:family="paragraph" style:class="text"/><style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text"><style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm"/></style:style><style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text"><style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" fo:keep-with-next="always"/><style:text-properties style:font-name="Albany" fo:font-size="14pt" style:font-name-asian="MS Mincho" style:font-size-asian="14pt" style:font-name-complex="Tahoma" style:font-size-complex="14pt"/></style:style><style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list"><style:text-properties style:font-name-complex="Tahoma1"/></style:style><style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" text:number-lines="false" text:line-number="0"/><style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Tahoma1" style:font-size-complex="12pt" style:font-style-complex="italic"/></style:style><style:style style:name="Index" sty
-e:family="paragraph" style:parent-style-name="Standard" style:class="index"><style:paragraph-properties text:number-lines="false" text:line-number="0"/><style:text-properties style:font-name-complex="Tahoma1"/></style:style><text:outline-style><text:outline-level-style text:level="1" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="2" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="3" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="4" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="5" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="6" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="7" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="8" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="9" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="10" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style></text:outline-style><text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/><text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/><tex
-:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/></office:styles><office:automatic-styles><style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties><!--<style:tab-stops><style:tab-stop style:position="1.446cm"/><style:tab-stop style:position="3.704cm" style:type="center"/><style:tab-stop style:position="6.473cm" style:type="right"/></style:tab-stops>--></style:paragraph-properties></style:style><style:style style:name="T1" style:family="text"><style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/></style:style><style:style style:name="T2" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic"/></style:style><style:page-layout style:name="pm1"><style:page-layout-properties fo:page-width="20.999cm" fo:page-height="29.699cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm"><style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:adjustment="left" style:rel-width="25%" style:color="#000000"/></style:page-layout-properties><style:header-style/><style:footer-style/></style:page-layout></office:automatic-styles><office:master-styles><style:master-page style:name="Standard" style:page-layout-name="pm1"/></office:master-styles><office:body><office:text><office:forms form:automatic-focus="false" form:apply-design-mode="false"/><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/
-</text:sequence-decls><text:p text:style-name="P1"><text:span text:style-name="T1">HALLO</text:span> <text:span text:style-name="T2">WOLRD</text:span></text:p></office:text></office:body></office:document>
diff --git a/writerfilter/qa/cppunittests/sl/makefile.mk b/writerfilter/qa/cppunittests/sl/makefile.mk
deleted file mode 100644
index fa7cafc1dd00..000000000000
--- a/writerfilter/qa/cppunittests/sl/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=writerfilter
-TARGET=test-od_sl
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-SHL1OBJS=\
-    $(SLO)$/testOD_SL.obj \
-    $(SLO)$/FileLoggerImpl.obj\
-    $(SLO)$/ExternalViewLogger.obj
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-.IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=$(LB)$/iodiapi.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(LB)$/libodiapi.so
-.ENDIF
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP = export.map
-
-
-# END ------------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
diff --git a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
deleted file mode 100644
index 640db6dac53f..000000000000
--- a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
+++ /dev/null
@@ -1,118 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <testshl/simpleheader.hxx>
-#include <odiapi/xxml/XXmlReader.hxx>
-#include <odiapi/props/Properties.hxx>
-#include <odiapi/sl/od_sl.hxx>
-
-#include "../odiapi/FileLoggerImpl.hxx"
-#include "../odiapi/ExternalViewLogger.hxx"
-
-#include <osl/file.hxx>
-#include <osl/thread.hxx>
-
-using namespace writerfilter;
-using namespace osl;
-using namespace rtl;
-using namespace util;
-
-class MyHandler : public xxml::ContentHandler
-{
-public:
-    virtual void startDocument()
-    {
-    }
-    virtual void endDocument()
-    {
-    }
-    virtual void startElement(QName_t name, QName_t attrName[], const xxml::Value *attrValue[], int attrs)
-    {
-        printf("<{%s}:%s>\n", QName::serializer().getNamespaceUri(name), QName::serializer().getLocalName(name));
-        for(int i=0;i<attrs;i++)
-        {
-            printf("@{%s}:%s=\"%s\"\n", QName::serializer().getNamespaceUri(attrName[i]), QName::serializer().getLocalName(attrName[i]), attrValue[i]->getOString().getStr());
-        }
-    }
-    virtual void endElement(QName_t name)
-    {
-        printf("</{%s}:%s>\n", QName::serializer().getNamespaceUri(name), QName::serializer().getLocalName(name));
-    }
-    virtual void characters(const xxml::Value &value)
-    {
-        printf("\"%s\"\n", value.getOString().getStr());
-    }
-
-};
-
-OString getTempFileName(const OUString& fileName)
-{
-  OUString ousTmpUrl;
-  FileBase::getTempDirURL(ousTmpUrl);
-  if (!ousTmpUrl.endsWithIgnoreAsciiCaseAsciiL("/", 1))
-    ousTmpUrl += OUString::createFromAscii("/");
-  ousTmpUrl += fileName;
-
-  OUString sysTmpPath;
-  FileBase::getSystemPathFromFileURL(ousTmpUrl, sysTmpPath);
-
-  return OUStringToOString(sysTmpPath, osl_getThreadTextEncoding());
-}
-
-class TestXXML : public CppUnit::TestFixture
-{
-public:
-    void test()
-    {
-        odiapi::props::PropertyPool::Pointer_t propertyPool=odiapi::props::createPropertyPool();
-        std::auto_ptr<ODSLHandler> handler=ODSLHandler::createODSLHandler(propertyPool);
-        std::auto_ptr<xxml::XXmlReader> reader=xxml::XXmlReader::createXXmlReader(*handler);
-        reader->read("helloworld.odt.flat.xml");
-
-        OString tmpFileName = getTempFileName(OUString::createFromAscii("dumpSlPool_int.dot"));
-        printf("Pool dump: %s\n", tmpFileName.getStr());
-        FileLoggerImpl fl(tmpFileName.getStr());
-        propertyPool->dump(&fl);
-
-        OString tmpFileName2 = getTempFileName(OUString::createFromAscii("dumpSlPool_ext.dot"));
-        printf("Pool dump: %s\n", tmpFileName2.getStr());
-        ExternalViewLoggerImpl evl(tmpFileName2.getStr());
-        propertyPool->dump(&evl);
-    }
-
-    CPPUNIT_TEST_SUITE(TestXXML);
-    CPPUNIT_TEST(test);
-
-
-    CPPUNIT_TEST_SUITE_END();
-};
-
-//#####################################
-// register test suites
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestXXML, "TestXXML");
-
-NOADDITIONAL;
diff --git a/writerfilter/qa/cppunittests/xxml/export.map b/writerfilter/qa/cppunittests/xxml/export.map
deleted file mode 100644
index 7321bbca16ad..000000000000
--- a/writerfilter/qa/cppunittests/xxml/export.map
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        registerAllTestFunction;
-
-    local:
-        *;
-};
diff --git a/writerfilter/qa/cppunittests/xxml/makefile.mk b/writerfilter/qa/cppunittests/xxml/makefile.mk
deleted file mode 100644
index 7f0d3f9731b4..000000000000
--- a/writerfilter/qa/cppunittests/xxml/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=writerfilter
-TARGET=test-xxml
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl
-
-.IF "$(GUI)" == "WNT"
-    CFLAGS+=/Ob1
-.ENDIF
-
-SHL1OBJS=\
-    $(SLO)$/testXXML.obj
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-.IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=$(LB)$/iodiapi.lib
-.ENDIF
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(LB)$/libodiapi.so
-.ENDIF
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP = export.map
-
-
-# END ------------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
diff --git a/writerfilter/qa/cppunittests/xxml/test.xml b/writerfilter/qa/cppunittests/xxml/test.xml
deleted file mode 100644
index 74e5fbd82d2f..000000000000
--- a/writerfilter/qa/cppunittests/xxml/test.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<test xmlns="http://sample.org/test" xmlns:tst="http://sample.org/test" v1="a" tst:v2="b">HALLO</test>
diff --git a/writerfilter/qa/cppunittests/xxml/testXXML.cxx b/writerfilter/qa/cppunittests/xxml/testXXML.cxx
deleted file mode 100644
index b5f780583fc5..000000000000
--- a/writerfilter/qa/cppunittests/xxml/testXXML.cxx
+++ /dev/null
@@ -1,188 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org 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 version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <testshl/simpleheader.hxx>
-#include <odiapi/xxml/XXmlReader.hxx>
-#include <osl/time.h>
-
-
-using namespace writerfilter;
-
-class Node
-{
-public:
-    QName_t tag;
-    Node *next;
-    Node *prev;
-
-    Node(QName_t tag) : prev(NULL), next(NULL), tag(tag) {
-    };
-
-    void append(Node &node)
-    {
-        this->next=&node;
-        node.prev=this;
-    }
-};
-
-class Table : public Node
-{
-public:
-    Table(QName_t tag):Node(tag) {};
-};
-
-class Row : public Node
-{
-public:
-    Table &parent;
-
-    Row(QName_t tag, Table &parent) : Node(tag), parent(parent) {};
-};
-
-class Cell : public Node
-{
-public:
-    Row &parent;
-
-    Cell(QName_t tag, Row &parent) : Node(tag), parent(parent) {};
-};
-
-
-class MyHandler : public xxml::ContentHandler
-{
-public:
-    int events;
-    Table *currentTable;
-    Row *currentRow;
-    Cell *currentCell;
-
-    virtual void startDocument()
-    {
-        currentTable=NULL;
-        currentRow=NULL;
-        currentCell=NULL;
-        events=1;
-    }
-    virtual void endDocument()
-    {
-        events++;
-    }
-    virtual void startElement(QName_t name, QName_t attrName[], const xxml::Value *attrValue[], int attrs)
-    {
-        events++;
-//      printf("<{%s}:%s>\n", QName::serializer().getNamespaceUri(name), QName::serializer().getLocalName(name));
-        for(int i=0;i<attrs;i++)
-        {
-//          printf("@{%s}:%s=\"%s\"\n", QName::serializer().getNamespaceUri(attrName[i]), QName::serializer().getLocalName(attrName[i]), attrValue[i]->getOString().getStr());
-            events++;
-        }
-
-        switch(name)
-        {
-        case NS_table::LN_table:
-        case NS_ss11::LN_Table:
-            currentTable=new Table(name);
-            break;
-        case NS_table::LN_table_row:
-        case NS_ss11::LN_Row:
-            if (currentRow==NULL)
-                currentRow=new Row(name, *currentTable);
-            else
-                currentRow->append(*new Row(name, *currentTable));
-            break;
-        case NS_table::LN_table_cell:
-        case NS_ss11::LN_Cell:
-            if (currentCell==NULL)
-                currentCell=new Cell(name, *currentRow);
-            else
-                currentCell->append(*new Cell(name, *currentRow));
-            break;
-
-        };
-
-    }
-    virtual void endElement(QName_t name)
-    {
-            //printf("</{%s}:%s>\n", QName::serializer().getNamespaceUri(name), QName::serializer().getLocalName(name));
-            events++;
-            switch(name)
-            {
-            case NS_table::LN_table:
-            case NS_ss11::LN_Table:
-                if (currentTable != NULL)
-                {
-                    currentRow->append(*currentTable);
-                }
-                currentRow=NULL;
-                break;
-            case NS_table::LN_table_row:
-            case NS_ss11::LN_Row:
-                if (currentRow != NULL)
-                    currentCell->append(*currentRow);
-                currentCell=NULL;
-                break;
-            case NS_table::LN_table_cell:
-            case NS_ss11::LN_Cell:
-                break;
-
-            };
-    }
-    virtual void characters(const xxml::Value &value)
-    {
-        //printf("\"%s\"\n", value.getOString().getStr());
-        events++;
-    }
-
-};
-
-class TestXXML : public CppUnit::TestFixture
-{
-public:
-    void test()
-    {
-        MyHandler handler;
-        std::auto_ptr<xxml::XXmlReader> reader=xxml::XXmlReader::createXXmlReader(handler);
-        TimeValue t1; osl_getSystemTime(&t1);
-
-//      reader->read("test.xml");
-//      reader->read("C:\\Documents and Settings\\fr156068\\My Documents\\odt\\testfile.xml");
-        reader->read("C:\\Documents and Settings\\fr156068\\My Documents\\odt\\testfile\\content.xml");
-        TimeValue t2; osl_getSystemTime(&t2);
-        printf("Events=%i time=%is time/event=%0.10fs\n", handler.events, t2.Seconds-t1.Seconds, (double)(t2.Seconds-t1.Seconds)/(double)handler.events);
-    }
-
-    CPPUNIT_TEST_SUITE(TestXXML);
-    CPPUNIT_TEST(test);
-
-
-    CPPUNIT_TEST_SUITE_END();
-};
-
-//#####################################
-// register test suites
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestXXML, "TestXXML");
-
-NOADDITIONAL;
diff --git a/writerfilter/qa/documents/fields.docx b/writerfilter/qa/documents/fields.docx
index 4eaa60393269..4eaa60393269 100755..100644
--- a/writerfilter/qa/documents/fields.docx
+++ b/writerfilter/qa/documents/fields.docx