Sun Jul 24 11:49:05 PDT 2011

.gitattributes                                     |    1 
 filter/source/msfilter/msocximex.cxx               |   16 -
 filter/source/msfilter/mstoolbar.cxx               |    2 
 filter/source/msfilter/msvbasic.cxx                |   12 
 hwpfilter/Library_hwp.mk                           |   14 -
 oox/Library_oox.mk                                 |   30 --
 oox/Makefile                                       |    2 
 oox/Package_source.mk                              |   29 ++
 oox/source/token/Makefile                          |  126 +++++++++
 unoxml/JunitTest_unordf_complex.mk                 |    2 
 unoxml/JunitTest_unoxml_complex.mk                 |    2 
 unoxml/Library_unordf.mk                           |   18 -
 unoxml/Library_unoxml.mk                           |   14 -
 writerfilter/CppunitTest_writerfilter_doctok.mk    |   56 ++++
 writerfilter/JunitTest_writerfilter_complex.mk     |   55 ++++
 writerfilter/Library_doctok.mk                     |   75 -----
 writerfilter/Library_ooxml.mk                      |  205 +--------------
 writerfilter/Library_resourcemodel.mk              |   36 --
 writerfilter/Library_rtftok.mk                     |   13 
 writerfilter/Library_writerfilter.mk               |    9 
 writerfilter/Library_writerfilter_uno.mk           |    7 
 writerfilter/Module_writerfilter.mk                |   12 
 writerfilter/Package_generated.mk                  |   32 --
 writerfilter/Package_writerfilter_generated.mk     |   78 +++++
 writerfilter/inc/resourcemodel/QNameToString.hxx   |    1 
 writerfilter/qa/complex/ooxml/LoadDocuments.java   |   82 ++++--
 writerfilter/qa/complex/ooxml/TestDocument.java    |   40 +++
 writerfilter/qa/cppunittests/doctok/testdoctok.cxx |  276 +++++++--------------
 writerfilter/source/Makefile                       |  203 +++++++++++++++
 writerfilter/source/generated.mk                   |   55 ++++
 30 files changed, 883 insertions(+), 620 deletions(-)

New commits:
commit f5810de6ec27c3606ba695c974f858b9266fbd8d
Merge: c630100... 6a11d94...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Jul 24 19:22:59 2011 +0200

    Merge branch 'master' into feature/gnumake4

commit c63010032f65d296bcf89a3a93f547605bcc9d3f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 15:53:00 2011 +0200

    remove superfluous include paths

diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index 1d8375c..75d4ed7 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -40,8 +40,6 @@ $(eval $(call gb_Library_set_include,ooxml,\
 	-I$(WORKDIR)/CustomTarget/writerfilter/source \
 	-I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
 	-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
-    -I$(WORKDIR)/writerfilter/inc \
-    -I$(WORKDIR)/writerfilter/inc/ooxml \
     -I$(OUTDIR)/inc \
 ))
 
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index bfbf8e3..b434545 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -33,9 +33,11 @@ $(eval $(call gb_Library_set_include,rtftok,\
 	-I$(realpath $(SRCDIR)/writerfilter/inc) \
 	-I$(WORKDIR)/CustomTarget/writerfilter/source \
 	-I$(OUTDIR)/inc \
-	-I$(OUTDIR)/inc/offapi \
-	-I$(OUTDIR)/inc/offuh \
-	-I$(OUTDIR)/inc/udkapi \
+))
+
+$(eval $(call gb_Library_add_api,rtftok,\
+	offapi \
+	udkapi \
 ))
 
 include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
commit aaa8940a1b08871c694f50db3e9b47388e0b7394
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 15:23:21 2011 +0200

    keep gbuild calls consistent at  now, even if it is a bit longer

diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index ee337a4..a3bfaf2 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,hwp,\
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_external,hwp,zlib)
+$(eval $(call gb_Library_use_external,hwp,zlib))
 
 ifeq ($(OS),WNT)
 
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 2f709ff..6d91d72 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -45,10 +45,10 @@ $(eval $(call gb_Library_add_linked_libs,unordf,\
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_externals,unordf,\
+$(eval $(call gb_Library_use_externals,unordf,\
 	librdf \
 	libxslt \
-)
+))
 
 $(eval $(call gb_Library_add_exception_objects,unordf,\
     unoxml/source/rdf/CBlankNode \
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index a0ab78c..5081c1b 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,unoxml,\
     $(gb_STDLIBS) \
 ))
 
-$(call gb_Library_use_external,unoxml,libxml2)
+$(eval $(call gb_Library_use_external,unoxml,libxml2))
 
 $(eval $(call gb_Library_add_exception_objects,unoxml,\
     unoxml/source/dom/node \
commit b7f2eba1bbf694c3132e643abd2554dc4299b1bc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 14:11:23 2011 +0200

    use gb_Library_use_external in writerfilter

diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
index 1b56bb8..2715170 100644
--- a/writerfilter/Library_doctok.mk
+++ b/writerfilter/Library_doctok.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,doctok,\
     -I$(WORKDIR)/CustomTarget/writerfilter/source \
     -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
     -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
 
@@ -44,7 +43,6 @@ include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
 $(eval $(call gb_Library_add_defs,doctok,\
 	-DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION \
 	$(writerfilter_debug_flags) \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_api,doctok,\
@@ -60,6 +58,8 @@ $(eval $(call gb_Library_add_linked_libs,doctok,\
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_external,doctoc,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,doctok,\
     writerfilter/source/doctok/Dff \
     writerfilter/source/doctok/DffImpl \
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index 902703d..1d8375c 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -42,14 +42,12 @@ $(eval $(call gb_Library_set_include,ooxml,\
 	-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
     -I$(WORKDIR)/writerfilter/inc \
     -I$(WORKDIR)/writerfilter/inc/ooxml \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_Library_add_defs,ooxml,\
 	-DWRITERFILTER_OOXML_DLLIMPLEMENTATION \
 	$(writerfilter_debug_flags) \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_api,ooxml,\
@@ -70,6 +68,8 @@ $(eval $(call gb_Library_add_linked_libs,ooxml,\
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_external,ooxml,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,ooxml,\
     writerfilter/source/dmapper/BorderHandler \
     writerfilter/source/dmapper/CellColorHandler \
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index 422d518..423b7af 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,resourcemodel,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
     -I$(WORKDIR)/CustomTarget/writerfilter/source \
-    $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
 
@@ -40,7 +39,6 @@ include $(SRCDIR)/writerfilter/debug_setup.mk
 $(eval $(call gb_Library_add_defs,resourcemodel,\
 	-DWRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION \
 	$(writerfilter_debug_flags) \
-    $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_api,resourcemodel,\
@@ -53,10 +51,11 @@ $(eval $(call gb_Library_add_linked_libs,resourcemodel,\
     cppu \
     cppuhelper \
     sal \
-    xml2 \
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_external,resourcemodel,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,resourcemodel,\
     writerfilter/source/resourcemodel/Fraction \
     writerfilter/source/resourcemodel/LoggedResources \
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 073b4ee..6d47672 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,writerfilter))
 $(eval $(call gb_Library_set_include,writerfilter,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_api,writerfilter,\
@@ -45,7 +44,6 @@ include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
 $(eval $(call gb_Library_add_defs,writerfilter,\
 	-DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \
 	$(writerfilter_debug_flags) \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,writerfilter,\
@@ -64,10 +62,11 @@ $(eval $(call gb_Library_add_linked_libs,writerfilter,\
     svt \
     tl \
     utl \
-    xml2 \
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_external,writerfilter,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,writerfilter,\
     writerfilter/source/filter/ImportFilter \
     writerfilter/source/filter/RtfFilter \
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index e2cefed..7177687 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -30,13 +30,11 @@ $(eval $(call gb_Library_Library,writerfilter_uno))
 $(eval $(call gb_Library_set_include,writerfilter_uno,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_Library_add_defs,writerfilter_uno,\
 	-DWRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION \
-	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
 $(eval $(call gb_Library_add_api,writerfilter_uno,\
@@ -56,6 +54,8 @@ $(eval $(call gb_Library_add_linked_libs,writerfilter_uno,\
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_external,writerfilter_uno,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,writerfilter_uno,\
     writerfilter/unocomponent/component \
     writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService \
commit 67b7e643dd4ff043f60b0619dad6fe3d81dcde21
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 13:58:45 2011 +0200

    merge junittests from feature/gnumake4_writerfilter_head (e0ac3ddd8a3602490854829107908abefc3eaf2f)

diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index 87f4b6a..6a7d206 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -37,4 +37,12 @@ $(eval $(call gb_Module_add_targets,writerfilter,\
     Package_writerfilter_generated \
 ))
 
+$(eval $(call gb_Module_add_check_targets,writerfilter,\
+    CppunitTest_writerfilter_doctok \
+))
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\
+    JunitTest_writerfilter_complex \
+))
+
 # vim: set noet ts=4 sw=4:
diff --git a/writerfilter/qa/complex/ooxml/LoadDocuments.java b/writerfilter/qa/complex/ooxml/LoadDocuments.java
index 6f05391..09185e6 100644
--- a/writerfilter/qa/complex/ooxml/LoadDocuments.java
+++ b/writerfilter/qa/complex/ooxml/LoadDocuments.java
@@ -1,9 +1,19 @@
 
 package complex.ooxml;
+
+import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
 import complexlib.ComplexTestCase;
 import java.io.File;
-import com.sun.star.text.XTextDocument;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.Argument;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
 
 /*
  * To change this template, choose Tools | Templates
@@ -14,38 +24,54 @@ import com.sun.star.text.XTextDocument;
  *
  * @author hb137859
  */
-public class LoadDocuments extends ComplexTestCase {
-    private XMultiServiceFactory m_xMSF;
-
-    @Override
-    public String[] getTestMethodNames() {
-        return new String [] {
-            "test1"
-        };
-    }
-
-    public void before() throws Exception {
-        m_xMSF = (XMultiServiceFactory) param.getMSF();
-    }
-
-    public void test1() {
-        String testDocumentsPath = util.utils.getFullTestDocName("");
-        log.println("Test documents in:" + testDocumentsPath);
+public class LoadDocuments {
+    @Test public void test1() {
+        String testDocumentsPath = Argument.get("tdoc");
+        System.out.println("Test documents in:" + testDocumentsPath);
 
         File dir = new File(testDocumentsPath);
         String [] files = dir.list();
 
-        if (files != null) {
-            for (int i = 0; i < files.length; ++i) {
-                log.println(files[i]);
-                String url = util.utils.getFullTestURL(files[i]);
-                log.println(url);
-
-                XTextDocument xDoc = util.WriterTools.loadTextDoc(m_xMSF, url);
-                util.DesktopTools.closeDoc(xDoc);
+        try {            
+            if (files != null) {
+                for (int i = 0; i < files.length; ++i) {
+                    System.out.println(files[i]);
+                    String url = TestDocument.getUrl(files[i]);
+                    System.out.println(url);
+                    
+                    XComponent xDoc = util.DesktopTools.loadDoc(getMSF(), url, null);
+                    System.out.println("loaded.");
+                    util.DesktopTools.closeDoc(xDoc);
+                    System.out.println("done.");
+                }          
+            } else {
+                fail("Files not found");
             }
-        } else {
-            failed();
         }
+        catch (Exception e) {
+            System.out.println(e);
+            fail("failed");
+        }
+    }
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
     }
+    private static final OfficeConnection connection = new OfficeConnection();
 }
diff --git a/writerfilter/qa/complex/ooxml/TestDocument.java b/writerfilter/qa/complex/ooxml/TestDocument.java
new file mode 100644
index 0000000..95c5fe5
--- /dev/null
+++ b/writerfilter/qa/complex/ooxml/TestDocument.java
@@ -0,0 +1,40 @@
+/*************************************************************************
+*
+* 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.
+*
+************************************************************************/
+
+package complex.ooxml;
+
+import java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+import org.openoffice.test.Argument;
+
+final class TestDocument {
+    public static String getUrl(String name) {
+        return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name));
+    }
+
+    private TestDocument() {}
+}
commit e23b86fe1701573ded3cff3a1e7981e0a491421b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 13:55:28 2011 +0200

    merge cppunittest from feature/gnumake4_writerfilter_head (e0ac3ddd8a3602490854829107908abefc3eaf2f)

diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk
index 2cdebc0..7bcec91 100644
--- a/writerfilter/CppunitTest_writerfilter_doctok.mk
+++ b/writerfilter/CppunitTest_writerfilter_doctok.mk
@@ -32,20 +32,25 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \
 ))
 
 $(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_doctok, \
-	writerfilter \
-	ucbhelper \
-	cppuhelper \
 	cppu \
+	cppuhelper \
+	doctok \
+	resourcemodel \
 	sal \
-	stl \
+	ucbhelper \
+	writerfilter \
 	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\
 	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/offuh \
 	-I$(OUTDIR)/inc \
 	-I$(SRCDIR)/writerfilter/inc \
 ))
 
+$(eval $(call gb_CppunitTest_add_api,writerfilter_doctok,\
+	offapi \
+	udkapi \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
index 7ddabe1..5faa3ec 100644
--- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
+++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
@@ -1,227 +1,161 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 // autogenerated file with codegen.pl
 
-#include <testshl/simpleheader.hxx>
-
+#include <sal/cppunit.h>
 #include <osl/process.h>
-#include <ucbhelper/contentbroker.hxx>
 #include <cppuhelper/bootstrap.hxx>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#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 <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
+#include <iostream>
 
-#include <doctok/exceptions.hxx>
 #include <doctok/WW8Document.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
-
-#include <iostream>
 
 namespace testdoctok
 {
-    using namespace ::std;
-    using namespace ::com::sun::star;
-    using namespace doctok;
+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;
+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
+class test : public CppUnit::TestFixture
+{
+
+public:
+    // initialise your test code values here.
+    void setUp()
     {
+    }
 
-    public:
-        // initialise your test code values here.
-        void setUp()
-        {
-        }
+    void tearDown()
+    {
+    }
 
-        void tearDown()
-        {
-        }
+    void testInitUno()
+    {
+        bool bResult = false;
 
-        void testInitUno()
-        {
-            bool bResult = false;
+        // initialise UCB-Broker
+        uno::Reference<uno::XComponentContext>
+            xComponentContext
+            (::cppu::defaultBootstrap_InitialComponentContext());
+        OSL_ASSERT( xComponentContext.is() );
 
-            // initialise UCB-Broker
-            uno::Reference<uno::XComponentContext>
-                xComponentContext
-                (::cppu::defaultBootstrap_InitialComponentContext());
-            OSL_ASSERT( xComponentContext.is() );
+        xContext = xComponentContext;
 
-            xContext = xComponentContext;
+        uno::Reference<lang::XMultiComponentFactory>
+            xFactory(xComponentContext->getServiceManager() );
+        OSL_ASSERT(xFactory.is());
 
-            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::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() );
 
-            uno::Reference<lang::XMultiServiceFactory>
-                xServiceFactory(xFactory, uno::UNO_QUERY);
-            OSL_ASSERT( xServiceFactory.is() );
+        if (xServiceFactory.is())
+        {
+            sal_Bool bRet =
+                ::ucbhelper::ContentBroker::initialize(xServiceFactory,
+                                                       aUcbInitSequence);
 
-            if (xServiceFactory.is())
+            OSL_ASSERT(bRet);
+            if (bRet)
             {
-                sal_Bool bRet =
-                    ::ucb::ContentBroker::initialize(xServiceFactory,
-                                                     aUcbInitSequence);
-
-                OSL_ASSERT(bRet);
-                if (bRet)
-                {
-                    uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
-                        xNameContainer(xFactory->createInstanceWithContext
+                uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
+                    xNameContainer(xFactory->createInstanceWithContext
                                        (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
                                         ("com.sun.star.ucb.SimpleFileAccess" )),
-                                        xComponentContext), uno::UNO_QUERY );
+                                    xComponentContext), uno::UNO_QUERY );
 
-                    if (xNameContainer.is())
-                    {
-                        xSimpleFileAccess = xNameContainer;
+                if (xNameContainer.is())
+                {
+                    xSimpleFileAccess = xNameContainer;
 
-                        bResult = true;
-                    }
+                    bResult = true;
                 }
             }
-
-            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, "/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 << ".";
-                }
-
-                clog << endl;
+        CPPUNIT_ASSERT_MESSAGE("UNO initialization failed",
+                               bResult);
+    }
 
-                xStream = xSimpleFileAccess->openFileRead(sInputFileURL);
-
-                WW8Stream::Pointer_t pStream =
-                    WW8DocumentFactory::createStream(xContext, xStream);
-
-                pDocument = WW8DocumentFactory::createDocument(pStream);
-            }
-            catch (doctok::Exception)
-            {
-                clog << "Exception!!" << endl;
-            }
-
-            CPPUNIT_ASSERT_MESSAGE("creating document failed",
-                                   pDocument != NULL);
+    // insert your test code here.
+    void testOpenFile()
+    {
+        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);
 
-#if 1
-        }
+        rtl::OUString sInputFileURL( absfile );
 
-        void testTraversal()
+        for (sal_Int32 n = 0; n < sInputFileURL.getLength(); ++n)
         {
-#endif
-            sal_uInt32 nResult = 0;
+            sal_uChar nC = sInputFileURL[n];
 
-            try
-            {
-                WW8DocumentIterator::Pointer_t pIt = pDocument->begin();
-                WW8DocumentIterator::Pointer_t pItEnd = pDocument->end();
+            if (nC < 0xff && isprint(nC))
+                clog << static_cast<char>(nC);
+            else
+                clog << ".";
+        }
 
-                while (! pIt->equal(*pItEnd))
-                {
-                    pIt->dump(clog);
+        clog << endl;
 
-                    clog << endl;
+        xStream = xSimpleFileAccess->openFileRead(sInputFileURL);
 
-                    WW8PropertySet::Pointer_t pAttrs = pIt->getProperties();
+        WW8Stream::Pointer_t pStream =
+            WW8DocumentFactory::createStream(xContext, xStream);
 
-                    if (pAttrs != NULL)
-                    {
-                        pAttrs->dump(clog);
-                    }
+        pDocument.reset(WW8DocumentFactory::createDocument(pStream));
 
-                    pIt->getText().dump(clog);
-                    ++(*pIt);
-                    ++nResult;
-                }
-            }
-            catch (doctok::Exception)
-            {
-                clog << "Exception!!" << endl;
-            }
+        CPPUNIT_ASSERT_MESSAGE("creating document failed",
+                               pDocument != NULL);
+    }
 
-            char sBuffer[256];
-            snprintf(sBuffer, 255, "%d", nResult);
-            clog << "Iterator steps:" << sBuffer << endl;
-
-            CPPUNIT_ASSERT_MESSAGE("traversing document failed",
-                                   nResult > 0);
-        }
-
-        void testEvents()
-        {
-            try
-            {
-                Stream::Pointer_t pStream = doctok::createStreamHandler();
+    void testEvents()
+    {
+        ::writerfilter::Stream::Pointer_t pStream = ::writerfilter::createStreamHandler();
 
-                pDocument->resolve(*pStream);
-            }
-            catch (doctok::Exception)
-            {
-                clog << "Exception!!" << endl;
-            }
-        }
+        pDocument->resolve(*pStream);
+    }
 
-        void testEnd()
-        {
-            ::ucb::ContentBroker::deinitialize();
-        }
+    void testEnd()
+    {
+        ::ucbhelper::ContentBroker::deinitialize();
+    }
 
-        // 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.
+    // 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(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");
+// -----------------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(testdoctok::test, "doctok");
 } // namespace doctok
 
 
 // -----------------------------------------------------------------------------
 
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f33601bf6fb597842501af5ea6b9748c152c2248
Author: Michael Stahl <mst at openoffice.org>
Date:   Sat Jul 23 13:36:46 2011 +0200

    add unittests from gnumake4

diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk
new file mode 100644
index 0000000..2cdebc0
--- /dev/null
+++ b/writerfilter/CppunitTest_writerfilter_doctok.mk
@@ -0,0 +1,51 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_doctok))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \
+	writerfilter/qa/cppunittests/doctok/testdoctok \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_doctok, \
+	writerfilter \
+	ucbhelper \
+	cppuhelper \
+	cppu \
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/offuh \
+	-I$(OUTDIR)/inc \
+	-I$(SRCDIR)/writerfilter/inc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk
new file mode 100644
index 0000000..5262f0a
--- /dev/null
+++ b/writerfilter/JunitTest_writerfilter_complex.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR))
+
+$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\
+	$$(DEFS) \
+	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_add_jars,writerfilter_complex,\
+	$(OUTDIR)/bin/OOoRunner.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/test.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,writerfilter_complex,\
+	writerfilter/qa/complex/ooxml/TestDocument \
+	writerfilter/qa/complex/ooxml/LoadDocuments \
+))
+
+# #i113098# currently fails in non-pro
+ifeq ($(gb_PRODUCT),$(true))
+$(eval $(call gb_JunitTest_add_classes,writerfilter_complex,\
+	complex.ooxml.LoadDocuments \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
commit 9d78af5ec6ccbc591abfbd37a7d9992c297f6af9
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 13:29:59 2011 +0200

    switch to CostumTarget-based code generation from gnumake4

diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
index 0782d5d..1b56bb8 100644
--- a/writerfilter/Library_doctok.mk
+++ b/writerfilter/Library_doctok.mk
@@ -30,9 +30,11 @@ $(eval $(call gb_Library_Library,doctok))
 $(eval $(call gb_Library_set_include,doctok,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
+    -I$(realpath $(SRCDIR)/writerfilter/source) \
     -I$(realpath $(SRCDIR)/writerfilter/source/doctok) \
-    -I$(WORKDIR)/writerfilter/inc \
-    -I$(WORKDIR)/writerfilter/inc/doctok \
+    -I$(WORKDIR)/CustomTarget/writerfilter/source \
+    -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
+    -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
@@ -84,67 +86,7 @@ $(eval $(call gb_Library_add_exception_objects,doctok,\
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,doctok,\
-	writerfilter/source/doctok/resources \
+	CustomTarget/writerfilter/source/resources \
 ))
 
-doctok_GENDIR := $(WORKDIR)/writerfilter
-doctok_HXXOUTDIR := $(doctok_GENDIR)/inc/doctok
-doctok_HXXOUTDIRCREATED := $(doctok_HXXOUTDIR)/created
-
-ooxml_BASEDIR := $(realpath $(SRCDIR)/writerfilter)
-
-doctok_QNAMETOSTRXSL := $(ooxml_BASEDIR)/source/doctok/qnametostr.xsl
-doctok_RESOURCEIDSXSL := $(ooxml_BASEDIR)/source/doctok/resourceids.xsl
-doctok_RESOURCESIMPLXSL := $(ooxml_BASEDIR)/source/doctok/resourcesimpl.xsl
-doctok_RESOURCESXSL := $(ooxml_BASEDIR)/source/doctok/resources.xsl
-doctok_RESOURCETOOLSXSL := $(ooxml_BASEDIR)/source/doctok/resourcetools.xsl
-doctok_SPRMCODETOSTRXSL := $(ooxml_BASEDIR)/source/doctok/sprmcodetostr.xsl
-doctok_SPRMIDSXSL := $(ooxml_BASEDIR)/source/doctok/sprmids.xsl
-
-doctok_MODEL := $(ooxml_BASEDIR)/source/doctok/resources.xmi
-
-doctok_RESOURCEIDSHXX := $(doctok_HXXOUTDIR)/resourceids.hxx
-doctok_SPRMIDSHXX := $(doctok_HXXOUTDIR)/sprmids.hxx
-doctok_RESOURCESHXX := $(doctok_HXXOUTDIR)/resources.hxx
-doctok_RESOURCESCXX := $(call gb_GenCxxObject_get_source,writerfilter/source/doctok/resources)
-
-doctok_QNAMETOSTRTMP := $(doctok_GENDIR)/doctok_qnameToStr.tmp
-doctok_SPRPMCODETOSTRTMP := $(doctok_GENDIR)/sprmcodetostr.tmp
-
-doctok_GENHEADERS = \
-    $(doctok_RESOURCEIDSHXX) \
-    $(doctok_SPRMIDSHXX) \
-    $(doctok_RESOURCESHXX)
-
-doctok_GENFILES = \
-    $(doctok_GENHEADERS) \
-    $(doctok_QNAMETOSTRTMP) \
-    $(doctok_RESOURCESCXX) \
-    $(doctok_SPRPMCODETOSTRTMP)
-
-$(doctok_HXXOUTDIRCREATED) :
-	mkdir -p $(dir $@) && touch $@
-
-$(doctok_GENHEADERS) : $(doctok_HXXOUTDIRCREATED)
-
-define doctok_xsl_process_model
-$(1) : $(2) $(doctok_MODEL)
-	mkdir -p $(dir $(1)) && $$(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet $(2) $(doctok_MODEL)) > $(1)
-endef
-
-$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCESHXX),$(doctok_RESOURCESXSL)))
-$(eval $(call doctok_xsl_process_model,$(doctok_QNAMETOSTRTMP),$(doctok_QNAMETOSTRXSL)))
-$(eval $(call doctok_xsl_process_model,$(doctok_SPRMIDSHXX),$(doctok_SPRMIDSXSL)))
-$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCESCXX),$(doctok_RESOURCESIMPLXSL)))
-$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCEIDSHXX),$(doctok_RESOURCEIDSXSL)))
-$(eval $(call doctok_xsl_process_model,$(doctok_SPRPMCODETOSTRTMP),$(doctok_SPRMCODETOSTRXSL)))
-
-$(doctok_RESOURCESCXX) : $(doctok_GENHEADERS) $(doctok_RESOURCETOOLSXSL)
-
-doctok_clean:
-	rm -rf $(doctok_GENFILES) $(doctok_HXXOUTDIR)
-.PHONY: doctok_clean
-
-$(call gb_Library_get_clean_target,doctok) : doctok_clean
-
 # vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index dcfa678..902703d 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -25,21 +25,27 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
+include $(realpath $(SRCDIR)/writerfilter/source/generated.mk)
+
 $(eval $(call gb_Library_Library,ooxml))
 
+$(eval $(call gb_Library_add_package_headers,ooxml,writerfilter_generated))
+
 $(eval $(call gb_Library_set_include,ooxml,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
     -I$(realpath $(SRCDIR)/writerfilter/source/ooxml) \
     -I$(realpath $(SRCDIR)/writerfilter/source/dmapper) \
+	-I$(WORKDIR)/CustomTarget/writerfilter/source \
+	-I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
+	-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
     -I$(WORKDIR)/writerfilter/inc \
     -I$(WORKDIR)/writerfilter/inc/ooxml \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
 
-include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
-
 $(eval $(call gb_Library_add_defs,ooxml,\
 	-DWRITERFILTER_OOXML_DLLIMPLEMENTATION \
 	$(writerfilter_debug_flags) \
@@ -55,6 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,ooxml,\
     comphelper \
     cppu \
     cppuhelper \
+	doctok \
 	i18nisolang1 \
 	i18npaper \
 	resourcemodel \
@@ -105,189 +112,10 @@ $(eval $(call gb_Library_add_exception_objects,ooxml,\
     writerfilter/source/ooxml/OOXMLStreamImpl \
 ))
 
-ooxml_NAMESPACES := \
-    dml-baseStylesheet \
-    dml-baseTypes \
-    dml-chartDrawing \
-    dml-documentProperties \
-    dml-graphicalObject \
-    dml-shape3DCamera \
-    dml-shape3DLighting \
-    dml-shape3DScene \
-    dml-shape3DStyles \
-    dml-shapeEffects \
-    dml-shapeGeometry \
-    dml-shapeLineProperties \
-    dml-shapeProperties \
-    dml-styleDefaults \
-    dml-stylesheet \
-    dml-textCharacter \
-    dml-wordprocessingDrawing \
-    shared-math \
-    shared-relationshipReference \
-    sml-customXmlMappings \
-    vml-main \
-    vml-officeDrawing \
-    vml-wordprocessingDrawing \
-    wml
-
-ooxml_factory_source_stem = writerfilter/source/ooxml/OOXMLFactory_$(1)
-
-define ooxml_factory_source
-$(call gb_GenCxxObject_get_source,$(call ooxml_factory_source_stem,$(1)))
-endef
-
-define ooxml_namespace_sources
-$(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_source,$(namespace)))
-endef
-
 $(eval $(call gb_Library_add_generated_exception_objects,ooxml,\
-    writerfilter/source/ooxml/OOXMLFactory_generated \
-    writerfilter/source/ooxml/OOXMLFactory_values \
-	$(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_source_stem,$(namespace))) \
+    $(patsubst %,CustomTarget/writerfilter/source/OOXMLFactory_%,$(WRITERFILTER_OOXMLNAMESPACES)) \
+    CustomTarget/writerfilter/source/OOXMLFactory_generated \
+    CustomTarget/writerfilter/source/OOXMLFactory_values \
 ))
 
-SLOFACTORIESNAMESPACES= \
-    $(SLO)/ooxml_Factory_{$(NAMESPACES)}.obj
-
-ooxml_HXXOUTDIR := $(WORKDIR)/writerfilter/inc/ooxml
-ooxml_CXXOUTDIR := $(dir $(call ooxml_factory_source,generated))
-ooxml_MISCDIR := $(WORKDIR)/writerfilter/ooxml
-
-ooxml_HXXOUTDIRCREATED := $(ooxml_HXXOUTDIR)/created
-
-define ooxml_factory_header
-$(ooxml_HXXOUTDIR)/OOXMLFactory_$(1).hxx
-endef
-
-define ooxml_namespace_headers
-$(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_header,$(namespace)))
-endef
-
-ooxml_BASEDIR := $(realpath $(SRCDIR)/writerfilter)
-
-ooxml_MODEL := $(ooxml_BASEDIR)/source/ooxml/model.xml
-
-ooxml_FACTORYIMPLNSXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl_ns.xsl
-ooxml_FACTORYIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl.xsl
-ooxml_FACTORYINCXSL := $(ooxml_BASEDIR)/source/ooxml/factoryinc.xsl
-ooxml_FACTORYNSXSL := $(ooxml_BASEDIR)/source/ooxml/factory_ns.xsl
-ooxml_FACTORYTOOLSXSL := $(ooxml_BASEDIR)/source/ooxml/factorytools.xsl
-ooxml_FACTORYVALUESIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl_values.xsl
-ooxml_FACTORYVALUESXSL := $(ooxml_BASEDIR)/source/ooxml/factory_values.xsl
-ooxml_FASTTOKENSXSL := $(ooxml_BASEDIR)/source/ooxml/fasttokens.xsl
-ooxml_GPERFFASTTOKENXSL := $(ooxml_BASEDIR)/source/ooxml/gperffasttokenhandler.xsl
-ooxml_NAMESPACEIDSXSL := $(ooxml_BASEDIR)/source/ooxml/namespaceids.xsl
-ooxml_PREPROCESSXSL := $(ooxml_BASEDIR)/source/ooxml/modelpreprocess.xsl
-ooxml_QNAMETOSTRXSL := $(ooxml_BASEDIR)/source/ooxml/qnametostr.xsl
-ooxml_RESORUCETOKENSXSL := $(ooxml_BASEDIR)/source/ooxml/resourcestokens.xsl
-ooxml_RESOURCEIDSXSL := $(ooxml_BASEDIR)/source/ooxml/resourceids.xsl
-ooxml_RESOURCESIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/resourcesimpl.xsl
-
-ooxml_NSPROCESS := $(SRCDIR)/writerfilter/source/resourcemodel/namespace_preprocess.pl
-
-ooxml_RESOURCEIDSHXX := $(ooxml_HXXOUTDIR)/resourceids.hxx
-
-ooxml_TOKENXML := $(ooxml_MISCDIR)/token.xml
-ooxml_TOKENXMLTMP := $(ooxml_MISCDIR)/token.tmp
-
-ooxml_FACTORYGENERATEDHXX := $(call ooxml_factory_header,generated)
-ooxml_FACTORYGENERATEDCXX := $(call ooxml_factory_source,generated)
-ooxml_FASTTOKENSHXX := $(ooxml_HXXOUTDIR)/OOXMLFastTokens.hxx
-ooxml_NAMESPACEIDSHXX := $(ooxml_HXXOUTDIR)/OOXMLnamespaceids.hxx
-ooxml_FACTORYVALUESHXX := $(call ooxml_factory_header,values)
-ooxml_FACTORYVALUESCXX := $(call ooxml_factory_source,values)
-ooxml_GPERFFASTTOKENHXX := $(ooxml_HXXOUTDIR)/gperffasttoken.hxx
-ooxml_GPERFFASTTOKENTMP := $(ooxml_MISCDIR)/gperffasttoken.tmp
-ooxml_QNAMETOSTRTMP := $(WORKDIR)/writerfilter/ooxml_qnameToStr.tmp
-
-ooxml_MODELPROCESSED := $(ooxml_MISCDIR)/model_preprocessed.xml
-ooxml_NSXSL := $(ooxml_MISCDIR)/namespacesmap.xsl
-ooxml_PREPROCESSXSLCOPIED := $(ooxml_MISCDIR)/modelpreprocess.xsl
-
-ooxml_NAMESPACESTXT := $(OUTDIR)/inc/oox/namespaces.txt
-
-ooxml_GENHEADERS = \
-    $(ooxml_FACTORYGENERATEDHXX) \
-    $(ooxml_FASTTOKENSHXX) \
-    $(ooxml_FACTORYVALUESHXX) \
-    $(ooxml_GPERFFASTTOKENHXX) \
-    $(ooxml_RESOURCEIDSHXX) \
-    $(ooxml_NAMESPACEIDSHXX) \
-    $(ooxml_namespace_headers)
-
-ooxml_GENERATEDFILES = \
-    $(ooxml_GENHEADERS) \
-    $(ooxml_GPERFFASTTOKENTMP) \
-    $(ooxml_FACTORYGENERATEDCXX) \
-    $(ooxml_MODELPROCESSED) \
-    $(ooxml_namespace_sources) \
-    $(ooxml_NSXSL) \
-    $(ooxml_FACTORYVALUESCXX) \
-    $(ooxml_PREPROCESSXSLCOPIED) \
-    $(ooxml_QNAMETOSTRTMP) \
-    $(ooxml_TOKENXMLTMP) \
-    $(ooxml_TOKENXML)
-
-$(ooxml_TOKENXMLTMP) : $(OUTDIR)/inc/oox/tokens.txt
-	mkdir -p $(dir $@) && sed -e 's#.*#<fasttoken>&</fasttoken>#' $< > $@
-
-$(ooxml_TOKENXML) : $(SRCDIR)/writerfilter/source/ooxml/tokenxmlheader $(ooxml_TOKENXMLTMP) $(SRCDIR)/writerfilter/source/ooxml/tokenxmlfooter
-	mkdir -p $(dir $@) && cat $(SRCDIR)/writerfilter/source/ooxml/tokenxmlheader $(ooxml_TOKENXMLTMP) $(SRCDIR)/writerfilter/source/ooxml/tokenxmlfooter > $@
-
-$(ooxml_HXXOUTDIRCREATED) :
-	mkdir -p $(dir $@) && touch $@
-
-$(ooxml_GENHEADERS) : $(ooxml_HXXOUTDIRCREATED)
-
-$(call ooxml_factory_source,%) :| $(call ooxml_factory_header,%)
-
-$(call ooxml_factory_source,%) : $(ooxml_FACTORYIMPLNSXSL) $(ooxml_MODELPROCESSED)
-	mkdir -p $(dir $@) && $(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet --stringparam file $@ $(ooxml_FACTORYIMPLNSXSL) $(ooxml_MODELPROCESSED)) > $@
-
-$(call ooxml_factory_header,%) : $(ooxml_FACTORYNSXSL) $(ooxml_MODELPROCESSED)
-	mkdir -p $(dir $@) && $(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet --stringparam file $@ $(ooxml_FACTORYNSXSL) $(ooxml_MODELPROCESSED)) > $@
-
-define ooxml_xsl_process
-$(1) : $(2) $(3)
-	mkdir -p $(dir $(1)) && $$(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet $(2) $(3)) > $(1)
-endef
-
-define ooxml_xsl_process_model
-$(call ooxml_xsl_process,$(1),$(2),$(ooxml_MODELPROCESSED))
-endef
-
-$(eval $(call ooxml_xsl_process,$(ooxml_MODELPROCESSED),$(ooxml_NSXSL),$(ooxml_MODEL)))
-$(eval $(call ooxml_xsl_process,$(ooxml_FASTTOKENSHXX),$(ooxml_FASTTOKENSXSL),$(ooxml_TOKENXML)))
-
-$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYGENERATEDHXX),$(ooxml_FACTORYINCXSL)))
-$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYGENERATEDCXX),$(ooxml_FACTORYIMPLXSL)))
-$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYVALUESHXX),$(ooxml_FACTORYVALUESXSL)))
-$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYVALUESCXX),$(ooxml_FACTORYVALUESIMPLXSL)))
-$(eval $(call ooxml_xsl_process_model,$(ooxml_QNAMETOSTRTMP),$(ooxml_QNAMETOSTRXSL)))
-$(eval $(call ooxml_xsl_process_model,$(ooxml_RESOURCEIDSHXX),$(ooxml_RESOURCEIDSXSL)))
-$(eval $(call ooxml_xsl_process_model,$(ooxml_NAMESPACEIDSHXX),$(ooxml_NAMESPACEIDSXSL)))
-$(eval $(call ooxml_xsl_process_model,$(ooxml_GPERFFASTTOKENTMP),$(ooxml_GPERFFASTTOKENXSL)))
-
-$(ooxml_NSXSL) : $(ooxml_NAMESPACESTXT) $(ooxml_NSPROCESS) $(ooxml_PREPROCESSXSLCOPIED)
-	mkdir -p $(dir $@) && perl $(ooxml_NSPROCESS) $(ooxml_NAMESPACESTXT) > $@
-
-# this is included by relative path from $(ooxml_NSXSL)
-$(ooxml_PREPROCESSXSLCOPIED) : $(ooxml_PREPROCESSXSL)
-	mkdir -p $(dir $@) && cp $< $@
-
-$(ooxml_GPERFFASTTOKENHXX) : $(ooxml_GPERFFASTTOKENTMP) $(ooxml_HXXOUTDIRCREATED)
-	tr -d '\r' < $< | gperf -I -t -E -S1 -c -G -LC++ > $@
-
-$(ooxml_GENERATEDFILES) : $(ooxml_FACTORYTOOLSXSL)
-
-$(ooxml_FACTORYVALUESCXX) :| $(ooxml_FACTORYVALUESHXX)
-$(ooxml_FACTORYGENERATEDCXX) :| $(ooxml_FACTORYGENERATEDHXX) $(ooxml_GENHEADERS)
-
-ooxml_clean :
-	rm -rf $(ooxml_GENERATEDFILES) $(ooxml_HXXOUTDIR)
-.PHONY : ooxml_clean
-
-$(call gb_Library_get_clean_target,ooxml) : ooxml_clean
-
 # vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index adc637e..422d518 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -26,12 +26,11 @@
 # instead of those above.
 
 $(eval $(call gb_Library_Library,resourcemodel))
-$(eval $(call gb_Library_add_package_headers,resourcemodel,writerfilter_generated))
 
 $(eval $(call gb_Library_set_include,resourcemodel,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
-    -I$(WORKDIR)/writerfilter/inc \
+    -I$(WORKDIR)/CustomTarget/writerfilter/source \
     $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
 ))
@@ -71,34 +70,12 @@ $(eval $(call gb_Library_add_exception_objects,resourcemodel,\
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,resourcemodel,\
-    writerfilter/source/resourcemodel/sprmcodetostr \
+    CustomTarget/writerfilter/source/sprmcodetostr \
 ))
 
 $(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\
-    writerfilter/source/resourcemodel/qnametostr \
+    CustomTarget/writerfilter/source/qnametostr \
 	, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
 
-define resourcemodel_gen_source
-$(call gb_GenCxxObject_get_source,$(1)) : $(2) $(SRCDIR)/$(1)header $(SRCDIR)/$(1)footer
-	mkdir -p $$(dir $$@) && cat $(SRCDIR)/$(1)header $(2) $(SRCDIR)/$(1)footer > $$@
-endef
-
-# the .tmp files are generated in doctok/ooxml library makefiles
-$(eval $(call resourcemodel_gen_source,writerfilter/source/resourcemodel/qnametostr,\
-    $(WORKDIR)/writerfilter/doctok_qnameToStr.tmp \
-    $(WORKDIR)/writerfilter/ooxml_qnameToStr.tmp \
-))
-$(eval $(call resourcemodel_gen_source,writerfilter/source/resourcemodel/sprmcodetostr,\
-    $(WORKDIR)/writerfilter/sprmcodetostr.tmp \
-))
-
-resourcemodel_clean :
-	rm -f \
-		$(call gb_GenCxxObject_get_source,writerfilter/source/resourcemodel/qnametostr) \
-		$(call gb_GenCxxObject_get_source,writerfilter/source/resourcemodel/sprmcodetostr)
-.PHONY : resourcemodel_clean
-
-$(call gb_Library_get_clean_target,resourcemodel) : resourcemodel_clean
-
 # vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index 4c3ecd1..bfbf8e3 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_Library,rtftok))
 $(eval $(call gb_Library_set_include,rtftok,\
 	$$(INCLUDE) \
 	-I$(realpath $(SRCDIR)/writerfilter/inc) \
-	-I$(WORKDIR)/writerfilter/inc \
+	-I$(WORKDIR)/CustomTarget/writerfilter/source \
 	-I$(OUTDIR)/inc \
 	-I$(OUTDIR)/inc/offapi \
 	-I$(OUTDIR)/inc/offuh \
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 8893133..073b4ee 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,writerfilter,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_Library_add_api,writerfilter,\
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index 6f2c532..87f4b6a 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -30,11 +30,11 @@ $(eval $(call gb_Module_Module,writerfilter))
 $(eval $(call gb_Module_add_targets,writerfilter,\
     Library_doctok \
     Library_ooxml \
-    Library_rtftok \
     Library_resourcemodel \
+    Library_rtftok \
     Library_writerfilter \
     Library_writerfilter_uno \
-    Package_generated \
+    Package_writerfilter_generated \
 ))
 
 # vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Package_generated.mk b/writerfilter/Package_generated.mk
deleted file mode 100644
index 682c3c6..0000000
--- a/writerfilter/Package_generated.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,writerfilter_generated,$(WORKDIR)/writerfilter/inc/doctok))
-
-$(eval $(call gb_Package_add_file,writerfilter_generated,inc/writerfilter/doctok/sprmids.hxx,sprmids.hxx))
-
-# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk
index 204e028..3d19a0b 100644
--- a/writerfilter/Package_writerfilter_generated.mk
+++ b/writerfilter/Package_writerfilter_generated.mk
@@ -34,8 +34,8 @@ $(eval $(call \
 $(eval $(call \
 	gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\
 		$(gb_XSLTPROCTARGET) \
-		$(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
-		$(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt \
+		$(OUTDIR)/inc$(UPDMINOREXT)/oox/tokens.txt \
+		$(OUTDIR)/inc$(UPDMINOREXT)/oox/namespaces.txt \
 ))
 
 $(eval $(call \
@@ -62,8 +62,6 @@ $(eval $(call \
 		writerfilter/source/ooxml/factoryimpl.xsl \
 		writerfilter/source/ooxml/factoryimpl_ns.xsl \
 		writerfilter/source/ooxml/factory_ns.xsl \
-		writerfilter/source/rtftok/RTFScanner.lex \
-		writerfilter/source/rtftok/RTFScanner.skl \
 		writerfilter/source/doctok/sprmcodetostr.xsl \
 		writerfilter/source/doctok/qnametostr.xsl \
 		writerfilter/source/ooxml/qnametostr.xsl \
diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx
index 293b9d6..4395d29 100644
--- a/writerfilter/inc/resourcemodel/QNameToString.hxx
+++ b/writerfilter/inc/resourcemodel/QNameToString.hxx
@@ -28,6 +28,7 @@
 #ifndef INCLUDED_QNAME_TO_STRING_HXX
 #define INCLUDED_QNAME_TO_STRING_HXX
 
+#include <WriterFilterDllApi.hxx>
 #include <boost/shared_ptr.hpp>
 #include <map>
 #include <string>
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
index 487888c..b50ff5d 100644
--- a/writerfilter/source/Makefile
+++ b/writerfilter/source/Makefile
@@ -74,12 +74,6 @@ wf_SRC_ooxml_FactoryValuesImpl_xsl=$(WFDIR)ooxml/factoryimpl_values.xsl
 wf_SRC_ooxml_ResourceIds_xsl=$(WFDIR)ooxml/resourceids.xsl
 wf_SRC_ooxml_GperfFastTokenHandler_xsl=$(WFDIR)ooxml/gperffasttokenhandler.xsl
 wf_SRC_ooxml_Analyze_model_xsl=$(WFDIR)ooxml/analyzemodel.xsl
-wf_SRC_ooxml_Status_stage1_sh=$(WFDIR)ooxml/stage1.sh
-wf_SRC_ooxml_Status_stage2_xsl=$(WFDIR)ooxml/analyzestage2.xsl
-wf_SRC_ooxml_Status_stage3_xsl=$(WFDIR)ooxml/analyzestage3.xsl
-wf_SRC_ooxml_Status_todo_xsl=$(WFDIR)ooxml/todo.xsl
-wf_SRC_ooxml_Status_efforts_xsl=$(WFDIR)ooxml/effort.xsl
-
 wf_GEN_ooxml_ResourceIds_hxx=ooxml/resourceids.hxx
 
 wf_GEN_ooxml_token_xml=token.xml
@@ -94,11 +88,6 @@ wf_GEN_ooxml_FactoryValues_cxx=OOXMLFactory_values.cxx
 wf_GEN_ooxml_GperfFastToken_hxx=gperffasttoken.hxx
 wf_GEN_ooxml_Model_processed=model_preprocessed.xml
 wf_GEN_ooxml_Model_analyzed=ooxml/model_analyzed.xml
-wf_GEN_ooxml_Status_stage1=ooxml/status_stage1.xml
-wf_GEN_ooxml_Status_stage2=ooxml/status_stage2.xml
-wf_GEN_ooxml_Status_stage3=ooxml/status_stage3.xml
-wf_GEN_ooxml_Status_todo=ooxml/todo.xml
-wf_GEN_ooxml_Status_efforts=ooxml/efforts.csv
 
 $(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt
 	cat $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
@@ -141,21 +130,6 @@ $(wf_GEN_ooxml_GperfFastToken_hxx) : $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $
 $(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model)
 	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
 
-$(wf_GEN_ooxml_Status_stage1) : $(wf_GEN_ooxml_Model_analyzed) $(wf_SRC_ooxml_stage1_sh)
-	$(wf_SRC_ooxml_Status_stage1_sh) $(wf_GEN_ooxml_Model_analyzed) $(WFDIR)dmapper > $@
-
-$(wf_GEN_ooxml_Status_stage2) : $(wf_SRC_ooxml_Status_stage2_xsl) $(wf_GEN_ooxml_Status_stage1)
-	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-
-$(wf_GEN_ooxml_Status_stage3) : $(wf_SRC_ooxml_Status_stage3_xsl) $(wf_GEN_ooxml_Status_stage2)
-	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-
-$(wf_GEN_ooxml_Status_todo) : $(wf_SRC_ooxml_Status_todo_xsl) $(wf_GEN_ooxml_Status_stage3)
-	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-
-$(wf_GEN_ooxml_Status_efforts) : $(wf_SRC_ooxml_Status_efforts_xsl) $(wf_GEN_ooxml_Status_todo)
-	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
-
 # rtftok
 
 wf_SRC_rtftok_scanner_lex=$(WFDIR)rtftok/RTFScanner.lex
@@ -179,7 +153,7 @@ wf_SRC_doctok_QNameToStr_xsl=$(WFDIR)doctok/qnametostr.xsl
 wf_SRC_ooxml_QNameToStr_xsl=$(WFDIR)ooxml/qnametostr.xsl
 wf_SRC_model_NamespacePreprocess=$(WFDIR)resourcemodel/namespace_preprocess.pl
 wf_GEN_ooxml_Namespacesmap_xsl=namespacesmap.xsl
-wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt
+wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc$(UPDMINOREXT)/oox/namespaces.txt
 wf_GEN_ooxml_preprocess_xsl=modelpreprocess.xsl
 
 $(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)
@@ -223,7 +197,6 @@ all : \
 	$(wf_GEN_ooxml_FastTokens_hxx) \
 	$(wf_GEN_ooxml_GperfFastToken_hxx) \
 	$(wf_GEN_ooxml_NamespaceIds_hxx) \
-	$(wf_GEN_ooxml_Status_efforts) \
 	$(wf_GEN_model_QNameToStr_cxx) \
 	$(wf_GEN_model_SprmCodeToStr_cxx) \
 	$(patsubst %,OOXMLFactory_%.hxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
commit e63f7d702cabfe0b3090c0823cf0437049c054e6
Author: Michael Stahl <mst at openoffice.org>
Date:   Sat Jul 23 11:03:35 2011 +0200

    reintroduce CustomTarget from gnumake4
    
    Authors: Michael Stahl <mst at openoffice.org>, Henning Brinkmann <hbrinkm at openoffice.org>

diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk
new file mode 100644
index 0000000..204e028
--- /dev/null
+++ b/writerfilter/Package_writerfilter_generated.mk
@@ -0,0 +1,80 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call \
+	gb_Package_Package,writerfilter_generated,$(WORKDIR)/CustomTarget/writerfilter/source))
+
+$(eval $(call \
+	gb_Package_add_customtarget,writerfilter_generated,writerfilter/source,SRCDIR))
+
+$(eval $(call \
+	gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\
+		$(gb_XSLTPROCTARGET) \
+		$(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
+		$(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt \
+))
+
+$(eval $(call \
+	gb_CustomTarget_add_dependencies,writerfilter/source,\
+		writerfilter/source/doctok/resources.xmi \
+		writerfilter/source/doctok/resources.xsl \
+		writerfilter/source/doctok/resourcesimpl.xsl \
+		writerfilter/source/doctok/resourceids.xsl \
+		writerfilter/source/doctok/sprmids.xsl \
+		writerfilter/source/doctok/resourcetools.xsl \
+		writerfilter/source/ooxml/model.xml \
+		writerfilter/source/ooxml/modelpreprocess.xsl \
+		writerfilter/source/ooxml/factorytools.xsl \
+		writerfilter/source/ooxml/fasttokens.xsl \
+		writerfilter/source/ooxml/namespaceids.xsl \
+		writerfilter/source/ooxml/factory_values.xsl \
+		writerfilter/source/ooxml/factoryimpl_values.xsl \
+		writerfilter/source/ooxml/resourceids.xsl \
+		writerfilter/source/ooxml/gperffasttokenhandler.xsl \
+		writerfilter/source/ooxml/gperffasttokenhandler.xsl \
+		writerfilter/source/ooxml/tokenxmlheader \
+		writerfilter/source/ooxml/tokenxmlfooter \
+		writerfilter/source/ooxml/factoryinc.xsl \
+		writerfilter/source/ooxml/factoryimpl.xsl \
+		writerfilter/source/ooxml/factoryimpl_ns.xsl \
+		writerfilter/source/ooxml/factory_ns.xsl \
+		writerfilter/source/rtftok/RTFScanner.lex \
+		writerfilter/source/rtftok/RTFScanner.skl \
+		writerfilter/source/doctok/sprmcodetostr.xsl \
+		writerfilter/source/doctok/qnametostr.xsl \
+		writerfilter/source/ooxml/qnametostr.xsl \
+		writerfilter/source/resourcemodel/namespace_preprocess.pl \
+		writerfilter/source/resourcemodel/qnametostrheader \
+		writerfilter/source/resourcemodel/qnametostrfooter \
+		writerfilter/source/resourcemodel/sprmcodetostrheader \
+		writerfilter/source/resourcemodel/sprmcodetostrfooter \
+))
+
+$(eval $(call gb_Package_add_file,writerfilter_generated,inc/writerfilter/doctok/sprmids.hxx,doctok/sprmids.hxx))
+$(eval $(call gb_Package_add_file,writerfilter_generated,inc/writerfilter/doctok/resourceids.hxx,doctok/resourceids.hxx))
+$(eval $(call gb_Package_add_file,writerfilter_generated,inc/writerfilter/ooxml/resourceids.hxx,ooxml/resourceids.hxx))
+
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
new file mode 100644
index 0000000..487888c
--- /dev/null
+++ b/writerfilter/source/Makefile
@@ -0,0 +1,230 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+WFDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(WFDIR)generated.mk
+include $(GBUILDDIR)/gbuild_simple.mk
+
+# doctok
+
+doctok :
+	mkdir doctok
+
+wf_SRC_doctok_Model=$(WFDIR)doctok/resources.xmi
+wf_SRC_doctok_Resources_xsl=$(WFDIR)doctok/resources.xsl
+wf_SRC_doctok_ResourcesImpl_xsl=$(WFDIR)doctok/resourcesimpl.xsl
+wf_SRC_doctok_ResourceIds_xsl=$(WFDIR)doctok/resourceids.xsl
+wf_SRC_doctok_SprmIds_xsl=$(WFDIR)doctok/sprmids.xsl
+wf_SRC_doctok_ResourceTools_xsl=$(WFDIR)doctok/resourcetools.xsl
+
+wf_GEN_doctok_SprmIds_hxx=doctok/sprmids.hxx
+wf_GEN_doctok_ResourceIds_hxx=doctok/resourceids.hxx
+wf_GEN_doctok_Resources_hxx=doctok/resources.hxx
+wf_GEN_doctok_Resources_cxx=resources.cxx
+
+$(wf_GEN_doctok_SprmIds_hxx) : doctok $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model)) > $@
+
+$(wf_GEN_doctok_ResourceIds_hxx) : doctok $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model)) > $@
+
+$(wf_GEN_doctok_Resources_hxx) : doctok $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model)) > $@
+
+$(wf_GEN_doctok_Resources_cxx) : doctok $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model) $(wf_SRC_doctok_ResourceTools_xsl)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model)) > $@
+
+# ooxml
+
+ooxml :
+	mkdir ooxml
+
+wf_SRC_ooxml_Model=$(WFDIR)ooxml/model.xml
+wf_SRC_ooxml_Preprocess_xsl=$(WFDIR)ooxml/modelpreprocess.xsl
+wf_SRC_ooxml_FactoryTools_xsl=$(WFDIR)ooxml/factorytools.xsl
+wf_SRC_ooxml_FastTokens_xsl=$(WFDIR)ooxml/fasttokens.xsl
+wf_SRC_ooxml_NamespaceIds_xsl=$(WFDIR)ooxml/namespaceids.xsl
+wf_SRC_ooxml_FactoryValues_xsl=$(WFDIR)ooxml/factory_values.xsl
+wf_SRC_ooxml_FactoryValuesImpl_xsl=$(WFDIR)ooxml/factoryimpl_values.xsl
+wf_SRC_ooxml_ResourceIds_xsl=$(WFDIR)ooxml/resourceids.xsl
+wf_SRC_ooxml_GperfFastTokenHandler_xsl=$(WFDIR)ooxml/gperffasttokenhandler.xsl
+wf_SRC_ooxml_Analyze_model_xsl=$(WFDIR)ooxml/analyzemodel.xsl
+wf_SRC_ooxml_Status_stage1_sh=$(WFDIR)ooxml/stage1.sh
+wf_SRC_ooxml_Status_stage2_xsl=$(WFDIR)ooxml/analyzestage2.xsl
+wf_SRC_ooxml_Status_stage3_xsl=$(WFDIR)ooxml/analyzestage3.xsl
+wf_SRC_ooxml_Status_todo_xsl=$(WFDIR)ooxml/todo.xsl
+wf_SRC_ooxml_Status_efforts_xsl=$(WFDIR)ooxml/effort.xsl
+
+wf_GEN_ooxml_ResourceIds_hxx=ooxml/resourceids.hxx
+
+wf_GEN_ooxml_token_xml=token.xml
+wf_GEN_ooxml_token_tmp=token.tmp
+
+wf_GEN_ooxml_Factory_hxx=OOXMLFactory_generated.hxx
+wf_GEN_ooxml_Factory_cxx=OOXMLFactory_generated.cxx
+wf_GEN_ooxml_FastTokens_hxx=ooxml/OOXMLFastTokens.hxx
+wf_GEN_ooxml_NamespaceIds_hxx=ooxml/OOXMLnamespaceids.hxx
+wf_GEN_ooxml_FactoryValues_hxx=OOXMLFactory_values.hxx
+wf_GEN_ooxml_FactoryValues_cxx=OOXMLFactory_values.cxx
+wf_GEN_ooxml_GperfFastToken_hxx=gperffasttoken.hxx
+wf_GEN_ooxml_Model_processed=model_preprocessed.xml
+wf_GEN_ooxml_Model_analyzed=ooxml/model_analyzed.xml
+wf_GEN_ooxml_Status_stage1=ooxml/status_stage1.xml
+wf_GEN_ooxml_Status_stage2=ooxml/status_stage2.xml
+wf_GEN_ooxml_Status_stage3=ooxml/status_stage3.xml
+wf_GEN_ooxml_Status_todo=ooxml/todo.xml
+wf_GEN_ooxml_Status_efforts=ooxml/efforts.csv
+
+$(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt
+	cat $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \
+	| sed "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
+
+$(wf_GEN_ooxml_token_xml) : $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter
+	cat $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter > $@
+
+$(wf_GEN_ooxml_FastTokens_hxx) : $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml)) > $@
+
+$(wf_GEN_ooxml_Factory_hxx) : $(WFDIR)ooxml/factoryinc.xsl $(wf_GEN_ooxml_Model_processed)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@
+
+$(wf_GEN_ooxml_Factory_cxx) : $(WFDIR)ooxml/factoryimpl.xsl $(wf_GEN_ooxml_Model_processed)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@
+
+OOXMLFactory%.cxx : $(WFDIR)ooxml/factoryimpl_ns.xsl $(wf_GEN_ooxml_Model_processed)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@
+
+OOXMLFactory%.hxx : $(WFDIR)ooxml/factory_ns.xsl $(wf_GEN_ooxml_Model_processed)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@
+
+$(wf_GEN_ooxml_FactoryValues_hxx) : $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
+
+$(wf_GEN_ooxml_FactoryValues_cxx) : $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
+
+$(wf_GEN_ooxml_ResourceIds_hxx) : ooxml $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
+
+$(wf_GEN_ooxml_NamespaceIds_hxx) : $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
+
+$(wf_GEN_ooxml_GperfFastToken_hxx) : $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed)) \
+	| tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
+
+$(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
+
+$(wf_GEN_ooxml_Status_stage1) : $(wf_GEN_ooxml_Model_analyzed) $(wf_SRC_ooxml_stage1_sh)
+	$(wf_SRC_ooxml_Status_stage1_sh) $(wf_GEN_ooxml_Model_analyzed) $(WFDIR)dmapper > $@
+
+$(wf_GEN_ooxml_Status_stage2) : $(wf_SRC_ooxml_Status_stage2_xsl) $(wf_GEN_ooxml_Status_stage1)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
+
+$(wf_GEN_ooxml_Status_stage3) : $(wf_SRC_ooxml_Status_stage3_xsl) $(wf_GEN_ooxml_Status_stage2)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
+
+$(wf_GEN_ooxml_Status_todo) : $(wf_SRC_ooxml_Status_todo_xsl) $(wf_GEN_ooxml_Status_stage3)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
+
+$(wf_GEN_ooxml_Status_efforts) : $(wf_SRC_ooxml_Status_efforts_xsl) $(wf_GEN_ooxml_Status_todo)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
+
+# rtftok
+
+wf_SRC_rtftok_scanner_lex=$(WFDIR)rtftok/RTFScanner.lex
+wf_SRC_rtftok_scanner_skl=$(WFDIR)rtftok/RTFScanner.skl
+
+wf_GEN_rtftok_scanner_cxx=RTFScanner.cxx
+
+# does not build, currently unused
+#$(wf_GEN_rtftok_scanner_cxx) : $(wf_SRC_rtftok_scanner_lex) $(wf_SRC_rtftok_scanner_skl)
+#	flex -+ -S$(wf_SRC_rtftok_scanner_skl) -o$@ $(wf_SRC_rtftok_scanner_lex)
+
+# resourcemodel
+
+wf_GEN_model_QNameToStr_cxx=qnametostr.cxx
+wf_GEN_ooxml_QNameToStr_tmp=OOXMLqnameToStr.tmp
+wf_GEN_model_SprmCodeToStr_cxx=sprmcodetostr.cxx
+wf_GEN_model_SprmCodeToStr_tmp=sprmcodetostr.tmp
+wf_GEN_doctok_QnameToStr_tmp=DOCTOKqnameToStr.tmp
+wf_SRC_doctok_SprmCodeToStr_xsl=$(WFDIR)doctok/sprmcodetostr.xsl
+wf_SRC_doctok_QNameToStr_xsl=$(WFDIR)doctok/qnametostr.xsl
+wf_SRC_ooxml_QNameToStr_xsl=$(WFDIR)ooxml/qnametostr.xsl
+wf_SRC_model_NamespacePreprocess=$(WFDIR)resourcemodel/namespace_preprocess.pl
+wf_GEN_ooxml_Namespacesmap_xsl=namespacesmap.xsl
+wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt
+wf_GEN_ooxml_preprocess_xsl=modelpreprocess.xsl
+
+$(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
+
+$(wf_GEN_doctok_QnameToStr_tmp): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)) > $@
+
+$(wf_GEN_model_QNameToStr_cxx): $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(WFDIR)resourcemodel/qnametostrheader $(WFDIR)resourcemodel/qnametostrfooter $(wf_SRC_ooxml_FactoryTools_xsl) $(wf_SRC_doctok_ResourceTools_xsl)
+	cat $(WFDIR)resourcemodel/qnametostrheader $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(WFDIR)resourcemodel/qnametostrfooter > $@
+
+$(wf_GEN_model_SprmCodeToStr_tmp) : $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)) > $@
+
+$(wf_GEN_model_SprmCodeToStr_cxx): $(WFDIR)resourcemodel/sprmcodetostrheader $(wf_GEN_model_SprmCodeToStr_tmp) $(WFDIR)resourcemodel/sprmcodetostrfooter
+	cat $^ > $@
+
+$(wf_GEN_ooxml_Namespacesmap_xsl) : $(wf_SRC_ooxml_Model) $(wf_DEP_ooxml_namespaces_txt) $(wf_SRC_model_NamespacePreprocess)
+	$(PERL) $(wf_SRC_model_NamespacePreprocess) $(wf_DEP_ooxml_namespaces_txt) > $@
+
+$(wf_GEN_ooxml_preprocess_xsl) : $(wf_SRC_ooxml_Preprocess_xsl)
+	cp -f $(wf_SRC_ooxml_Preprocess_xsl) $@
+
+$(wf_GEN_ooxml_Model_processed) : $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_GEN_ooxml_preprocess_xsl) $(wf_SRC_ooxml_Model)
+	$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_SRC_ooxml_Model)) > $@
+
+# all
+
+.DEFAULT_GOAL:=all
+.PHONY: all
+all : \
+	$(wf_GEN_doctok_SprmIds_hxx) \
+	$(wf_GEN_doctok_ResourceIds_hxx) \
+	$(wf_GEN_doctok_Resources_hxx) \
+	$(wf_GEN_doctok_Resources_cxx) \
+	$(wf_GEN_ooxml_ResourceIds_hxx) \
+	$(wf_GEN_ooxml_Factory_hxx) \
+	$(wf_GEN_ooxml_Factory_cxx) \
+	$(wf_GEN_ooxml_FactoryValues_hxx) \
+	$(wf_GEN_ooxml_FactoryValues_cxx) \
+	$(wf_GEN_ooxml_FastTokens_hxx) \
+	$(wf_GEN_ooxml_GperfFastToken_hxx) \
+	$(wf_GEN_ooxml_NamespaceIds_hxx) \
+	$(wf_GEN_ooxml_Status_efforts) \
+	$(wf_GEN_model_QNameToStr_cxx) \
+	$(wf_GEN_model_SprmCodeToStr_cxx) \
+	$(patsubst %,OOXMLFactory_%.hxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
+	$(patsubst %,OOXMLFactory_%.cxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
diff --git a/writerfilter/source/generated.mk b/writerfilter/source/generated.mk
new file mode 100644
index 0000000..39895d5
--- /dev/null
+++ b/writerfilter/source/generated.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+# this namespace list is needed both in the library and the custom makefile
+WRITERFILTER_OOXMLNAMESPACES= \
+	wml \
+	dml-stylesheet \
+	dml-styleDefaults \
+	dml-shape3DLighting \
+	dml-shape3DScene \
+	dml-shape3DStyles \
+	dml-shape3DCamera \
+	dml-baseStylesheet \
+	dml-textCharacter \
+	dml-shapeEffects \
+	dml-shapeLineProperties \
+	dml-shapeProperties \
+	dml-baseTypes \
+	dml-documentProperties \
+	dml-graphicalObject \
+	dml-shapeGeometry \
+	dml-wordprocessingDrawing \
+	sml-customXmlMappings \
+	shared-math \
+	shared-relationshipReference \
+	dml-chartDrawing \
+	vml-main \
+	vml-officeDrawing \
+	vml-wordprocessingDrawing \
+
+
commit 7d6d259af376b27f841843bbfffd49d4f772475f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 03:12:47 2011 +0200

    revert to old writerfilter gbuilization
    
     * gnumake4's writerfilter gbuildization got pushed in a seperate branch
     * it might or might not be merged to master later

diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk
deleted file mode 100644
index 5262f0a..0000000
--- a/writerfilter/JunitTest_writerfilter_complex.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR))
-
-$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\
-	$$(DEFS) \
-	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_add_jars,writerfilter_complex,\
-	$(OUTDIR)/bin/OOoRunner.jar \
-	$(OUTDIR)/bin/ridl.jar \
-	$(OUTDIR)/bin/test.jar \
-	$(OUTDIR)/bin/unoil.jar \
-	$(OUTDIR)/bin/jurt.jar \
-))
-
-$(eval $(call gb_JunitTest_add_sourcefiles,writerfilter_complex,\
-	writerfilter/qa/complex/ooxml/TestDocument \
-	writerfilter/qa/complex/ooxml/LoadDocuments \
-))
-
-# #i113098# currently fails in non-pro
-ifeq ($(gb_PRODUCT),$(true))
-$(eval $(call gb_JunitTest_add_classes,writerfilter_complex,\
-	complex.ooxml.LoadDocuments \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
new file mode 100644
index 0000000..0782d5d
--- /dev/null
+++ b/writerfilter/Library_doctok.mk
@@ -0,0 +1,150 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,doctok))
+
+$(eval $(call gb_Library_set_include,doctok,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/writerfilter/inc) \
+    -I$(realpath $(SRCDIR)/writerfilter/source/doctok) \
+    -I$(WORKDIR)/writerfilter/inc \
+    -I$(WORKDIR)/writerfilter/inc/doctok \
+	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
+    -I$(OUTDIR)/inc \
+))
+
+include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
+
+$(eval $(call gb_Library_add_defs,doctok,\
+	-DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION \
+	$(writerfilter_debug_flags) \
+	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
+))
+
+$(eval $(call gb_Library_add_api,doctok,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,doctok,\
+    cppu \
+    cppuhelper \
+    resourcemodel \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,doctok,\
+    writerfilter/source/doctok/Dff \
+    writerfilter/source/doctok/DffImpl \
+    writerfilter/source/doctok/WW8Annotation \
+    writerfilter/source/doctok/WW8BinTableImpl \
+    writerfilter/source/doctok/WW8Clx \
+    writerfilter/source/doctok/WW8CpAndFc \
+    writerfilter/source/doctok/WW8DocumentImpl \
+    writerfilter/source/doctok/WW8FKPImpl \
+    writerfilter/source/doctok/WW8FontTable \
+    writerfilter/source/doctok/WW8LFOTable \
+    writerfilter/source/doctok/WW8ListTable \
+    writerfilter/source/doctok/WW8OutputWithDepth \
+    writerfilter/source/doctok/WW8Picture \
+    writerfilter/source/doctok/WW8PieceTableImpl \
+    writerfilter/source/doctok/WW8PropertySetImpl \
+    writerfilter/source/doctok/WW8ResourceModelImpl \
+    writerfilter/source/doctok/WW8StreamImpl \
+    writerfilter/source/doctok/WW8StructBase \
+    writerfilter/source/doctok/WW8Sttbf \
+    writerfilter/source/doctok/WW8StyleSheet \
+    writerfilter/source/doctok/WW8Table \
+    writerfilter/source/doctok/WW8Text \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,doctok,\
+	writerfilter/source/doctok/resources \
+))
+
+doctok_GENDIR := $(WORKDIR)/writerfilter
+doctok_HXXOUTDIR := $(doctok_GENDIR)/inc/doctok
+doctok_HXXOUTDIRCREATED := $(doctok_HXXOUTDIR)/created
+
+ooxml_BASEDIR := $(realpath $(SRCDIR)/writerfilter)
+
+doctok_QNAMETOSTRXSL := $(ooxml_BASEDIR)/source/doctok/qnametostr.xsl
+doctok_RESOURCEIDSXSL := $(ooxml_BASEDIR)/source/doctok/resourceids.xsl
+doctok_RESOURCESIMPLXSL := $(ooxml_BASEDIR)/source/doctok/resourcesimpl.xsl
+doctok_RESOURCESXSL := $(ooxml_BASEDIR)/source/doctok/resources.xsl
+doctok_RESOURCETOOLSXSL := $(ooxml_BASEDIR)/source/doctok/resourcetools.xsl
+doctok_SPRMCODETOSTRXSL := $(ooxml_BASEDIR)/source/doctok/sprmcodetostr.xsl
+doctok_SPRMIDSXSL := $(ooxml_BASEDIR)/source/doctok/sprmids.xsl
+
+doctok_MODEL := $(ooxml_BASEDIR)/source/doctok/resources.xmi
+
+doctok_RESOURCEIDSHXX := $(doctok_HXXOUTDIR)/resourceids.hxx
+doctok_SPRMIDSHXX := $(doctok_HXXOUTDIR)/sprmids.hxx
+doctok_RESOURCESHXX := $(doctok_HXXOUTDIR)/resources.hxx
+doctok_RESOURCESCXX := $(call gb_GenCxxObject_get_source,writerfilter/source/doctok/resources)
+
+doctok_QNAMETOSTRTMP := $(doctok_GENDIR)/doctok_qnameToStr.tmp
+doctok_SPRPMCODETOSTRTMP := $(doctok_GENDIR)/sprmcodetostr.tmp
+
+doctok_GENHEADERS = \
+    $(doctok_RESOURCEIDSHXX) \
+    $(doctok_SPRMIDSHXX) \
+    $(doctok_RESOURCESHXX)
+
+doctok_GENFILES = \
+    $(doctok_GENHEADERS) \
+    $(doctok_QNAMETOSTRTMP) \
+    $(doctok_RESOURCESCXX) \
+    $(doctok_SPRPMCODETOSTRTMP)
+
+$(doctok_HXXOUTDIRCREATED) :
+	mkdir -p $(dir $@) && touch $@
+
+$(doctok_GENHEADERS) : $(doctok_HXXOUTDIRCREATED)
+
+define doctok_xsl_process_model
+$(1) : $(2) $(doctok_MODEL)
+	mkdir -p $(dir $(1)) && $$(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet $(2) $(doctok_MODEL)) > $(1)
+endef
+
+$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCESHXX),$(doctok_RESOURCESXSL)))
+$(eval $(call doctok_xsl_process_model,$(doctok_QNAMETOSTRTMP),$(doctok_QNAMETOSTRXSL)))
+$(eval $(call doctok_xsl_process_model,$(doctok_SPRMIDSHXX),$(doctok_SPRMIDSXSL)))
+$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCESCXX),$(doctok_RESOURCESIMPLXSL)))
+$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCEIDSHXX),$(doctok_RESOURCEIDSXSL)))
+$(eval $(call doctok_xsl_process_model,$(doctok_SPRPMCODETOSTRTMP),$(doctok_SPRMCODETOSTRXSL)))
+
+$(doctok_RESOURCESCXX) : $(doctok_GENHEADERS) $(doctok_RESOURCETOOLSXSL)
+
+doctok_clean:
+	rm -rf $(doctok_GENFILES) $(doctok_HXXOUTDIR)
+.PHONY: doctok_clean
+
+$(call gb_Library_get_clean_target,doctok) : doctok_clean
+
+# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
new file mode 100644
index 0000000..dcfa678
--- /dev/null
+++ b/writerfilter/Library_ooxml.mk
@@ -0,0 +1,293 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,ooxml))
+
+$(eval $(call gb_Library_set_include,ooxml,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/writerfilter/inc) \
+    -I$(realpath $(SRCDIR)/writerfilter/source/ooxml) \
+    -I$(realpath $(SRCDIR)/writerfilter/source/dmapper) \
+    -I$(WORKDIR)/writerfilter/inc \
+    -I$(WORKDIR)/writerfilter/inc/ooxml \
+	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
+    -I$(OUTDIR)/inc \
+))
+
+include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
+
+$(eval $(call gb_Library_add_defs,ooxml,\
+	-DWRITERFILTER_OOXML_DLLIMPLEMENTATION \
+	$(writerfilter_debug_flags) \
+	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
+))
+
+$(eval $(call gb_Library_add_api,ooxml,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ooxml,\
+    comphelper \
+    cppu \
+    cppuhelper \
+	i18nisolang1 \
+	i18npaper \
+	resourcemodel \
+    sal \
+    tl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ooxml,\
+    writerfilter/source/dmapper/BorderHandler \
+    writerfilter/source/dmapper/CellColorHandler \
+    writerfilter/source/dmapper/CellMarginHandler \
+    writerfilter/source/dmapper/ConversionHelper \
+    writerfilter/source/dmapper/DomainMapper \
+    writerfilter/source/dmapper/DomainMapper_Impl \
+    writerfilter/source/dmapper/DomainMapperTableHandler \
+    writerfilter/source/dmapper/DomainMapperTableManager \
+    writerfilter/source/dmapper/FFDataHandler \
+    writerfilter/source/dmapper/FontTable \
+    writerfilter/source/dmapper/FormControlHelper \
+    writerfilter/source/dmapper/GraphicHelpers \
+    writerfilter/source/dmapper/GraphicImport \
+    writerfilter/source/dmapper/MeasureHandler \
+    writerfilter/source/dmapper/ModelEventListener \
+    writerfilter/source/dmapper/NumberingManager \
+    writerfilter/source/dmapper/OLEHandler \
+    writerfilter/source/dmapper/PageBordersHandler \
+    writerfilter/source/dmapper/PropertyIds \
+    writerfilter/source/dmapper/PropertyMap \
+    writerfilter/source/dmapper/PropertyMapHelper \
+    writerfilter/source/dmapper/SectionColumnHandler \
+    writerfilter/source/dmapper/SettingsTable \
+    writerfilter/source/dmapper/StyleSheetTable \
+    writerfilter/source/dmapper/TablePropertiesHandler \
+    writerfilter/source/dmapper/TblStylePrHandler \
+    writerfilter/source/dmapper/TDefTableHandler \
+    writerfilter/source/dmapper/ThemeTable \
+    writerfilter/source/dmapper/WrapPolygonHandler \
+    writerfilter/source/ooxml/Handler \
+    writerfilter/source/ooxml/OOXMLBinaryObjectReference \
+    writerfilter/source/ooxml/OOXMLDocumentImpl \
+    writerfilter/source/ooxml/OOXMLFactory \
+    writerfilter/source/ooxml/OOXMLFastContextHandler \
+    writerfilter/source/ooxml/OOXMLFastDocumentHandler \
+    writerfilter/source/ooxml/OOXMLFastTokenHandler \
+    writerfilter/source/ooxml/OOXMLParserState \
+    writerfilter/source/ooxml/OOXMLPropertySetImpl \
+    writerfilter/source/ooxml/OOXMLStreamImpl \
+))
+
+ooxml_NAMESPACES := \
+    dml-baseStylesheet \
+    dml-baseTypes \
+    dml-chartDrawing \
+    dml-documentProperties \
+    dml-graphicalObject \
+    dml-shape3DCamera \
+    dml-shape3DLighting \
+    dml-shape3DScene \
+    dml-shape3DStyles \
+    dml-shapeEffects \
+    dml-shapeGeometry \
+    dml-shapeLineProperties \
+    dml-shapeProperties \
+    dml-styleDefaults \
+    dml-stylesheet \
+    dml-textCharacter \
+    dml-wordprocessingDrawing \
+    shared-math \
+    shared-relationshipReference \
+    sml-customXmlMappings \
+    vml-main \
+    vml-officeDrawing \
+    vml-wordprocessingDrawing \
+    wml
+
+ooxml_factory_source_stem = writerfilter/source/ooxml/OOXMLFactory_$(1)
+
+define ooxml_factory_source
+$(call gb_GenCxxObject_get_source,$(call ooxml_factory_source_stem,$(1)))
+endef
+
+define ooxml_namespace_sources
+$(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_source,$(namespace)))
+endef
+
+$(eval $(call gb_Library_add_generated_exception_objects,ooxml,\
+    writerfilter/source/ooxml/OOXMLFactory_generated \
+    writerfilter/source/ooxml/OOXMLFactory_values \
+	$(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_source_stem,$(namespace))) \
+))
+
+SLOFACTORIESNAMESPACES= \
+    $(SLO)/ooxml_Factory_{$(NAMESPACES)}.obj
+
+ooxml_HXXOUTDIR := $(WORKDIR)/writerfilter/inc/ooxml
+ooxml_CXXOUTDIR := $(dir $(call ooxml_factory_source,generated))
+ooxml_MISCDIR := $(WORKDIR)/writerfilter/ooxml
+
+ooxml_HXXOUTDIRCREATED := $(ooxml_HXXOUTDIR)/created
+
+define ooxml_factory_header
+$(ooxml_HXXOUTDIR)/OOXMLFactory_$(1).hxx
+endef
+
+define ooxml_namespace_headers
+$(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_header,$(namespace)))
+endef
+
+ooxml_BASEDIR := $(realpath $(SRCDIR)/writerfilter)
+
+ooxml_MODEL := $(ooxml_BASEDIR)/source/ooxml/model.xml
+
+ooxml_FACTORYIMPLNSXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl_ns.xsl
+ooxml_FACTORYIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl.xsl
+ooxml_FACTORYINCXSL := $(ooxml_BASEDIR)/source/ooxml/factoryinc.xsl
+ooxml_FACTORYNSXSL := $(ooxml_BASEDIR)/source/ooxml/factory_ns.xsl
+ooxml_FACTORYTOOLSXSL := $(ooxml_BASEDIR)/source/ooxml/factorytools.xsl
+ooxml_FACTORYVALUESIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl_values.xsl
+ooxml_FACTORYVALUESXSL := $(ooxml_BASEDIR)/source/ooxml/factory_values.xsl
+ooxml_FASTTOKENSXSL := $(ooxml_BASEDIR)/source/ooxml/fasttokens.xsl
+ooxml_GPERFFASTTOKENXSL := $(ooxml_BASEDIR)/source/ooxml/gperffasttokenhandler.xsl
+ooxml_NAMESPACEIDSXSL := $(ooxml_BASEDIR)/source/ooxml/namespaceids.xsl
+ooxml_PREPROCESSXSL := $(ooxml_BASEDIR)/source/ooxml/modelpreprocess.xsl
+ooxml_QNAMETOSTRXSL := $(ooxml_BASEDIR)/source/ooxml/qnametostr.xsl
+ooxml_RESORUCETOKENSXSL := $(ooxml_BASEDIR)/source/ooxml/resourcestokens.xsl
+ooxml_RESOURCEIDSXSL := $(ooxml_BASEDIR)/source/ooxml/resourceids.xsl
+ooxml_RESOURCESIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/resourcesimpl.xsl
+
+ooxml_NSPROCESS := $(SRCDIR)/writerfilter/source/resourcemodel/namespace_preprocess.pl
+
+ooxml_RESOURCEIDSHXX := $(ooxml_HXXOUTDIR)/resourceids.hxx
+
+ooxml_TOKENXML := $(ooxml_MISCDIR)/token.xml
+ooxml_TOKENXMLTMP := $(ooxml_MISCDIR)/token.tmp
+
+ooxml_FACTORYGENERATEDHXX := $(call ooxml_factory_header,generated)
+ooxml_FACTORYGENERATEDCXX := $(call ooxml_factory_source,generated)
+ooxml_FASTTOKENSHXX := $(ooxml_HXXOUTDIR)/OOXMLFastTokens.hxx
+ooxml_NAMESPACEIDSHXX := $(ooxml_HXXOUTDIR)/OOXMLnamespaceids.hxx
+ooxml_FACTORYVALUESHXX := $(call ooxml_factory_header,values)
+ooxml_FACTORYVALUESCXX := $(call ooxml_factory_source,values)
+ooxml_GPERFFASTTOKENHXX := $(ooxml_HXXOUTDIR)/gperffasttoken.hxx
+ooxml_GPERFFASTTOKENTMP := $(ooxml_MISCDIR)/gperffasttoken.tmp
+ooxml_QNAMETOSTRTMP := $(WORKDIR)/writerfilter/ooxml_qnameToStr.tmp
+
+ooxml_MODELPROCESSED := $(ooxml_MISCDIR)/model_preprocessed.xml
+ooxml_NSXSL := $(ooxml_MISCDIR)/namespacesmap.xsl
+ooxml_PREPROCESSXSLCOPIED := $(ooxml_MISCDIR)/modelpreprocess.xsl
+
+ooxml_NAMESPACESTXT := $(OUTDIR)/inc/oox/namespaces.txt
+
+ooxml_GENHEADERS = \
+    $(ooxml_FACTORYGENERATEDHXX) \
+    $(ooxml_FASTTOKENSHXX) \
+    $(ooxml_FACTORYVALUESHXX) \
+    $(ooxml_GPERFFASTTOKENHXX) \
+    $(ooxml_RESOURCEIDSHXX) \
+    $(ooxml_NAMESPACEIDSHXX) \
+    $(ooxml_namespace_headers)
+
+ooxml_GENERATEDFILES = \
+    $(ooxml_GENHEADERS) \
+    $(ooxml_GPERFFASTTOKENTMP) \
+    $(ooxml_FACTORYGENERATEDCXX) \
+    $(ooxml_MODELPROCESSED) \
+    $(ooxml_namespace_sources) \
+    $(ooxml_NSXSL) \
+    $(ooxml_FACTORYVALUESCXX) \
+    $(ooxml_PREPROCESSXSLCOPIED) \
+    $(ooxml_QNAMETOSTRTMP) \
+    $(ooxml_TOKENXMLTMP) \
+    $(ooxml_TOKENXML)
+
+$(ooxml_TOKENXMLTMP) : $(OUTDIR)/inc/oox/tokens.txt
+	mkdir -p $(dir $@) && sed -e 's#.*#<fasttoken>&</fasttoken>#' $< > $@
+
+$(ooxml_TOKENXML) : $(SRCDIR)/writerfilter/source/ooxml/tokenxmlheader $(ooxml_TOKENXMLTMP) $(SRCDIR)/writerfilter/source/ooxml/tokenxmlfooter
+	mkdir -p $(dir $@) && cat $(SRCDIR)/writerfilter/source/ooxml/tokenxmlheader $(ooxml_TOKENXMLTMP) $(SRCDIR)/writerfilter/source/ooxml/tokenxmlfooter > $@
+
+$(ooxml_HXXOUTDIRCREATED) :
+	mkdir -p $(dir $@) && touch $@
+
+$(ooxml_GENHEADERS) : $(ooxml_HXXOUTDIRCREATED)
+
+$(call ooxml_factory_source,%) :| $(call ooxml_factory_header,%)
+
+$(call ooxml_factory_source,%) : $(ooxml_FACTORYIMPLNSXSL) $(ooxml_MODELPROCESSED)
+	mkdir -p $(dir $@) && $(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet --stringparam file $@ $(ooxml_FACTORYIMPLNSXSL) $(ooxml_MODELPROCESSED)) > $@
+
+$(call ooxml_factory_header,%) : $(ooxml_FACTORYNSXSL) $(ooxml_MODELPROCESSED)
+	mkdir -p $(dir $@) && $(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet --stringparam file $@ $(ooxml_FACTORYNSXSL) $(ooxml_MODELPROCESSED)) > $@
+
+define ooxml_xsl_process
+$(1) : $(2) $(3)
+	mkdir -p $(dir $(1)) && $$(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet $(2) $(3)) > $(1)
+endef
+
+define ooxml_xsl_process_model
+$(call ooxml_xsl_process,$(1),$(2),$(ooxml_MODELPROCESSED))
+endef
+
+$(eval $(call ooxml_xsl_process,$(ooxml_MODELPROCESSED),$(ooxml_NSXSL),$(ooxml_MODEL)))
+$(eval $(call ooxml_xsl_process,$(ooxml_FASTTOKENSHXX),$(ooxml_FASTTOKENSXSL),$(ooxml_TOKENXML)))
+
+$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYGENERATEDHXX),$(ooxml_FACTORYINCXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYGENERATEDCXX),$(ooxml_FACTORYIMPLXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYVALUESHXX),$(ooxml_FACTORYVALUESXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYVALUESCXX),$(ooxml_FACTORYVALUESIMPLXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_QNAMETOSTRTMP),$(ooxml_QNAMETOSTRXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_RESOURCEIDSHXX),$(ooxml_RESOURCEIDSXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_NAMESPACEIDSHXX),$(ooxml_NAMESPACEIDSXSL)))
+$(eval $(call ooxml_xsl_process_model,$(ooxml_GPERFFASTTOKENTMP),$(ooxml_GPERFFASTTOKENXSL)))
+
+$(ooxml_NSXSL) : $(ooxml_NAMESPACESTXT) $(ooxml_NSPROCESS) $(ooxml_PREPROCESSXSLCOPIED)
+	mkdir -p $(dir $@) && perl $(ooxml_NSPROCESS) $(ooxml_NAMESPACESTXT) > $@
+
+# this is included by relative path from $(ooxml_NSXSL)
+$(ooxml_PREPROCESSXSLCOPIED) : $(ooxml_PREPROCESSXSL)
+	mkdir -p $(dir $@) && cp $< $@
+
+$(ooxml_GPERFFASTTOKENHXX) : $(ooxml_GPERFFASTTOKENTMP) $(ooxml_HXXOUTDIRCREATED)
+	tr -d '\r' < $< | gperf -I -t -E -S1 -c -G -LC++ > $@
+
+$(ooxml_GENERATEDFILES) : $(ooxml_FACTORYTOOLSXSL)
+
+$(ooxml_FACTORYVALUESCXX) :| $(ooxml_FACTORYVALUESHXX)
+$(ooxml_FACTORYGENERATEDCXX) :| $(ooxml_FACTORYGENERATEDHXX) $(ooxml_GENHEADERS)
+
+ooxml_clean :
+	rm -rf $(ooxml_GENERATEDFILES) $(ooxml_HXXOUTDIR)
+.PHONY : ooxml_clean
+
+$(call gb_Library_get_clean_target,ooxml) : ooxml_clean
+
+# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
new file mode 100644
index 0000000..adc637e
--- /dev/null
+++ b/writerfilter/Library_resourcemodel.mk
@@ -0,0 +1,104 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,resourcemodel))
+$(eval $(call gb_Library_add_package_headers,resourcemodel,writerfilter_generated))
+
+$(eval $(call gb_Library_set_include,resourcemodel,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/writerfilter/inc) \
+    -I$(WORKDIR)/writerfilter/inc \
+    $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
+    -I$(OUTDIR)/inc \
+))
+
+include $(SRCDIR)/writerfilter/debug_setup.mk
+
+$(eval $(call gb_Library_add_defs,resourcemodel,\
+	-DWRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION \
+	$(writerfilter_debug_flags) \
+    $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
+))
+
+$(eval $(call gb_Library_add_api,resourcemodel,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,resourcemodel,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    xml2 \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,resourcemodel,\
+    writerfilter/source/resourcemodel/Fraction \
+    writerfilter/source/resourcemodel/LoggedResources \
+    writerfilter/source/resourcemodel/Protocol \
+    writerfilter/source/resourcemodel/resourcemodel \
+    writerfilter/source/resourcemodel/ResourceModelHelper \
+    writerfilter/source/resourcemodel/TagLogger \
+    writerfilter/source/resourcemodel/util \
+    writerfilter/source/resourcemodel/WW8Analyzer \
+    writerfilter/source/resourcemodel/XPathLogger \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,resourcemodel,\
+    writerfilter/source/resourcemodel/sprmcodetostr \
+))
+
+$(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\
+    writerfilter/source/resourcemodel/qnametostr \
+	, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+define resourcemodel_gen_source
+$(call gb_GenCxxObject_get_source,$(1)) : $(2) $(SRCDIR)/$(1)header $(SRCDIR)/$(1)footer
+	mkdir -p $$(dir $$@) && cat $(SRCDIR)/$(1)header $(2) $(SRCDIR)/$(1)footer > $$@
+endef
+
+# the .tmp files are generated in doctok/ooxml library makefiles
+$(eval $(call resourcemodel_gen_source,writerfilter/source/resourcemodel/qnametostr,\
+    $(WORKDIR)/writerfilter/doctok_qnameToStr.tmp \
+    $(WORKDIR)/writerfilter/ooxml_qnameToStr.tmp \
+))
+$(eval $(call resourcemodel_gen_source,writerfilter/source/resourcemodel/sprmcodetostr,\
+    $(WORKDIR)/writerfilter/sprmcodetostr.tmp \
+))
+
+resourcemodel_clean :
+	rm -f \
+		$(call gb_GenCxxObject_get_source,writerfilter/source/resourcemodel/qnametostr) \
+		$(call gb_GenCxxObject_get_source,writerfilter/source/resourcemodel/sprmcodetostr)
+.PHONY : resourcemodel_clean
+
+$(call gb_Library_get_clean_target,resourcemodel) : resourcemodel_clean
+
+# vim: set noet ts=4 sw=4:
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
new file mode 100644
index 0000000..4c3ecd1
--- /dev/null
+++ b/writerfilter/Library_rtftok.mk
@@ -0,0 +1,71 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>

... etc. - the rest is truncated
