writerfilter10: convert writerfilter to gbuild [hg:1013d9bf5d0a]

24 files changed, 719 insertions, 1258 deletions

diff --git a/writerfilter/source/filter/makefile.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk
index 6b11fd4ff1f3..e2aea4036fbd 100644
--- a/writerfilter/source/filter/makefile.mk
+++ b/writerfilter/CppunitTest_writerfilter_doctok.mk
@@ -1,8 +1,8 @@
-#************************************************************************
+#*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,39 +14,33 @@
 #
 # 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
+# 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
+# version 3 along with OpenOffice.org.	If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-# ***********************************************************************/
-PRJ=..$/..
-PRJNAME=writerfilter
-TARGET=filter
-GEN_HID=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
-
-# --- Files -------------------------------------
-
-SLOFILES=           $(SLO)$/WriterFilter.obj \
-                    $(SLO)$/WriterFilterDetection.obj \
-                    $(SLO)$/ImportFilter.obj \
-                    $(SLO)$/RtfFilter.obj
-
+#*************************************************************************
 
-# --- Targets ----------------------------------
+$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_doctok))
 
-.INCLUDE : target.mk
+$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \
+	writerfilter/qa/cppunittests/doctok/testdoctok \
+))
 
+$(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_doctok, \
+	ucbhelper \
+	cppuhelper \
+	cppu \
+	sal \
+	cppunit \
+))
 
+$(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\
+	$$(INCLUDE) \
+))
 
+# 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 000000000000..3640fc952fc1
--- /dev/null
+++ b/writerfilter/JunitTest_writerfilter_complex.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_JunitTest_JunitTest,writerfilter_complex))
+
+$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\
+	$$(DEFS) \
+	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/documents \
+))
+
+$(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/LoadDocuments \
+))
+
+$(eval $(call gb_JunitTest_add_classes,writerfilter_complex,\
+	complex.ooxml.LoadDocuments \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
new file mode 100644
index 000000000000..e08c7d8aa558
--- /dev/null
+++ b/writerfilter/Library_writerfilter.mk
@@ -0,0 +1,155 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+include $(SRCDIR)/writerfilter/source/generated.mk
+
+$(eval $(call gb_Library_Library,writerfilter))
+
+$(eval $(call \
+	gb_Library_add_package_headers,writerfilter,writerfilter_inc writerfilter_generated))
+
+#$(eval $(call gb_Library_add_precompiled_header,writerfilter,$(SRCDIR)/writerfilter/PCH_FILE))
+
+$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
+
+$(eval $(call gb_Library_set_include,writerfilter,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/offuh \
+	-I$(SRCDIR)/writerfilter/inc \
+	-I$(WORKDIR)/CustomTarget/writerfilter/source \
+	-I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
+	-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
+	-I$(SRCDIR)/writerfilter/source/doctok \
+	-I$(SRCDIR)/writerfilter/source/ooxml \
+))
+
+$(eval $(call gb_Library_set_defs,writerfilter,\
+	$$(DEFS) \
+	-DWRITERFILTER_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,writerfilter,\
+	oox \
+	i18nisolang1 \
+	i18npaper \
+	sot \
+	tl \
+	utl \
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,writerfilter,\
+	writerfilter/source/dmapper/BorderHandler \
+	writerfilter/source/dmapper/CellColorHandler \
+	writerfilter/source/dmapper/CellMarginHandler \
+	writerfilter/source/dmapper/ConversionHelper \
+	writerfilter/source/dmapper/DomainMapper \
+	writerfilter/source/dmapper/DomainMapperTableHandler \
+	writerfilter/source/dmapper/DomainMapperTableManager \
+	writerfilter/source/dmapper/DomainMapper_Impl \
+	writerfilter/source/dmapper/FFDataHandler \
+	writerfilter/source/dmapper/FormControlHelper \
+	writerfilter/source/dmapper/FontTable \
+	writerfilter/source/dmapper/GraphicHelpers \
+	writerfilter/source/dmapper/GraphicImport \
+	writerfilter/source/dmapper/NumberingManager  \
+	writerfilter/source/dmapper/MeasureHandler \
+	writerfilter/source/dmapper/ModelEventListener \
+	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/TDefTableHandler \
+	writerfilter/source/dmapper/TablePropertiesHandler \
+	writerfilter/source/dmapper/TblStylePrHandler \
+	writerfilter/source/dmapper/ThemeTable \
+	writerfilter/source/resourcemodel/resourcemodel \
+	writerfilter/source/resourcemodel/util \
+	writerfilter/source/resourcemodel/TagLogger \
+	writerfilter/source/resourcemodel/ResourceModelHelper \
+	writerfilter/source/resourcemodel/WW8Analyzer \
+	writerfilter/source/resourcemodel/Protocol \
+	writerfilter/source/doctok/WW8Annotation \
+	writerfilter/source/doctok/WW8OutputWithDepth \
+	writerfilter/source/doctok/WW8Text \
+	writerfilter/source/doctok/DffImpl \
+	writerfilter/source/doctok/Dff \
+	writerfilter/source/doctok/WW8Picture \
+	writerfilter/source/doctok/WW8Sttbf \
+	writerfilter/source/doctok/WW8Table \
+	writerfilter/source/doctok/WW8StyleSheet \
+	writerfilter/source/doctok/WW8FontTable \
+	writerfilter/source/doctok/WW8LFOTable \
+	writerfilter/source/doctok/WW8ListTable \
+	writerfilter/source/doctok/WW8CpAndFc \
+	writerfilter/source/doctok/WW8StructBase \
+	writerfilter/source/doctok/WW8Clx \
+	writerfilter/source/doctok/WW8FKPImpl \
+	writerfilter/source/doctok/WW8BinTableImpl \
+	writerfilter/source/doctok/WW8StreamImpl \
+	writerfilter/source/doctok/WW8PropertySetImpl \
+	writerfilter/source/doctok/WW8DocumentImpl \
+	writerfilter/source/doctok/WW8PieceTableImpl \
+	writerfilter/source/doctok/WW8ResourceModelImpl \
+	writerfilter/source/ooxml/OOXMLFactory \
+	writerfilter/source/ooxml/OOXMLBinaryObjectReference\
+	writerfilter/source/ooxml/OOXMLPropertySetImpl \
+	writerfilter/source/ooxml/OOXMLParserState \
+	writerfilter/source/ooxml/Handler \
+	writerfilter/source/ooxml/OOXMLDocumentImpl \
+	writerfilter/source/ooxml/OOXMLStreamImpl \
+	writerfilter/source/ooxml/OOXMLFastDocumentHandler \
+	writerfilter/source/ooxml/OOXMLFastContextHandler \
+	writerfilter/source/ooxml/OOXMLFastTokenHandler \
+	writerfilter/source/rtftok/RTFParseException \
+	writerfilter/source/filter/WriterFilter \
+	writerfilter/source/filter/WriterFilterDetection \
+	writerfilter/source/filter/ImportFilter \
+	writerfilter/source/filter/RtfFilter \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\
+	CustomTarget/writerfilter/source/resources \
+	CustomTarget/writerfilter/source/qnametostr \
+	CustomTarget/writerfilter/source/sprmcodetostr \
+	$(patsubst %,CustomTarget/writerfilter/source/OOXMLFactory_%,$(WRITERFILTER_OOXMLNAMESPACES)) \
+	CustomTarget/writerfilter/source/OOXMLFactory_generated \
+	CustomTarget/writerfilter/source/OOXMLFactory_values \
+))
+
+#disabled
+#	CustomTarget/writerfilter/generated/RTFScanner \
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/writerfilter/Library_writerfilter_debug.mk b/writerfilter/Library_writerfilter_debug.mk
new file mode 100644
index 000000000000..1285fd8cedfd
--- /dev/null
+++ b/writerfilter/Library_writerfilter_debug.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# 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_Library_Library,writerfilter_debug))
+
+$(eval $(call gb_Library_set_include,writerfilter_debug,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/offuh \
+	-I$(SRCDIR)/writerfilter/inc \
+))
+
+$(eval $(call gb_Library_set_defs,writerfilter_debug,\
+	$$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,writerfilter_debug,\
+	writerfilter \
+	comphelper \
+	ucbhelper \
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,writerfilter_debug,\
+	writerfilter/unocomponent/debugservices/doctok/DocTokTestService \
+	writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService \
+	writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService \
+	writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService \
+	writerfilter/unocomponent/component \
+))
+
+# disabled
+#	writerfilter/unocomponent/debugservices/rtftok/ScannerTestService \
+#	writerfilter/unocomponent/debugservices/rtftok/XMLScanner \
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/writerfilter/unocomponent/debugservices/doctok/makefile.mk b/writerfilter/Makefile
index 989be1baa3de..c898975e5277 100644
--- a/writerfilter/unocomponent/debugservices/doctok/makefile.mk
+++ b/writerfilter/Makefile
@@ -1,7 +1,7 @@
-#************************************************************************
+#*************************************************************************
 #
 # 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
@@ -23,22 +23,16 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-# ***********************************************************************/
-PRJ=..$/..$/..
-PRJNAME=writerfilter
-TARGET=debugservices_doctok
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
+#*************************************************************************
 
-# --- Files --------------------------------------------------------
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-SLOFILES= \
-    $(SLO)$/DocTokTestService.obj \
-    $(SLO)$/DocTokAnalyzeService.obj
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-# --- Targets ------------------------------------------------------
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.INCLUDE :	target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/unocomponent/debugservices/rtftok/makefile.mk b/writerfilter/Module_writerfilter.mk
index 66c54a8707cd..940060e9698a 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/makefile.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -1,8 +1,8 @@
-#************************************************************************
+#*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,32 +14,34 @@
 #
 # 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
+# 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
+# version 3 along with OpenOffice.org.	If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-# ***********************************************************************/
-PRJ=..$/..$/..
-PRJNAME=writerfilter
-TARGET=debugservices_rtftok
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
+#*************************************************************************
 
-.INCLUDE :  settings.mk
+$(eval $(call gb_Module_Module,writerfilter))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_Module_add_targets,writerfilter,\
+	Package_inc \
+	Package_writerfilter_generated \
+	Library_writerfilter \
+	Library_writerfilter_debug \
+))
 
-SLOFILES=\
-    $(SLO)$/ScannerTestService.obj \
-    $(SLO)$/XMLScanner.obj 
-#$(SLO)$/TestService.obj $(SLO)$/ResolverTestService.obj $(SLO)$/XmlParserTestService.obj $(SLO)$/RngService.obj
+# does not build
+#$(eval $(call gb_Module_add_check_targets,writerfilter,\
+#	CppunitTest_writerfilter_doctok \
+#))
 
-# --- Targets ------------------------------------------------------
+# does not run
+#$(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\
+#	JunitTest_writerfilter_complex \
+#))
 
-.INCLUDE :	target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Package_inc.mk b/writerfilter/Package_inc.mk
new file mode 100644
index 000000000000..57ec0bea2c98
--- /dev/null
+++ b/writerfilter/Package_inc.mk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# 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_inc,$(SRCDIR)/writerfilter/inc))
+
+$(eval $(call gb_Package_add_file,writerfilter_inc,inc/writerfilter/WriterFilterDllApi.hxx,WriterFilterDllApi.hxx))
+$(eval $(call gb_Package_add_file,writerfilter_inc,inc/writerfilter/resourcemodel/OutputWithDepth.hxx,resourcemodel/OutputWithDepth.hxx))
+$(eval $(call gb_Package_add_file,writerfilter_inc,inc/writerfilter/resourcemodel/WW8ResourceModel.hxx,resourcemodel/WW8ResourceModel.hxx))
+$(eval $(call gb_Package_add_file,writerfilter_inc,inc/writerfilter/dmapper/DomainMapper.hxx,dmapper/DomainMapper.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk
new file mode 100644
index 000000000000..fcd8bfdf2457
--- /dev/null
+++ b/writerfilter/Package_writerfilter_generated.mk
@@ -0,0 +1,81 @@
+#*************************************************************************
+#
+# 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))
+
+
+$(eval $(call \
+	gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\
+		$(gb_XSLTPROCTARGET) \
+		$(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token.txt \
+		$(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/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/prj/build.lst b/writerfilter/prj/build.lst
index e70b99a052c5..61d0c5f8f515 100644
--- a/writerfilter/prj/build.lst
+++ b/writerfilter/prj/build.lst
@@ -1,11 +1,2 @@
 wf	writerfilter	: soltools sal BOOST:boost cppu cppuhelper ucbhelper tools svx LIBXSLT:libxslt oox NULL
-wf	writerfilter	usr1	-	all	wf_mkout NULL
-wf	writerfilter\source\resourcemodel	nmake	-	all	wf_resourcemodel NULL
-wf	writerfilter\source\doctok	nmake	-	all	wf_doctok wf_resourcemodel NULL
-wf	writerfilter\source\ooxml	nmake	-	all	wf_ooxml wf_resourcemodel NULL
-wf  writerfilter\source\filter      nmake   - all   wf_filter NULL
-wf  writerfilter\source\dmapper      nmake   - all   wf_dmapper wf_doctok wf_ooxml wf_resourcemodel NULL
-wf	writerfilter\unocomponent\debugservices\doctok	nmake	-	all	wf_debugservicesdoctok NULL
-wf	writerfilter\unocomponent\debugservices\ooxml	nmake	-	all	wf_debugservicesooxml NULL
-wf	writerfilter\unocomponent	nmake	-	all	wf_unocomponent wf_doctok wf_ooxml wf_resourcemodel wf_debugservicesdoctok wf_debugservicesooxml NULL
-wf  writerfilter\util   nmake   - all wf_util wf_filter wf_dmapper wf_doctok wf_ooxml wf_unocomponent NULL
+wf	writerfilter\prj	nmake	-	all	wf_prj NULL
diff --git a/writerfilter/inc/writerfilter.mk b/writerfilter/prj/makefile.mk
index f8ea735a4ec5..ae8e71a766f2 100644
--- a/writerfilter/inc/writerfilter.mk
+++ b/writerfilter/prj/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -25,5 +25,16 @@
 #
 #*************************************************************************
 
-CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
- 
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/writerfilter/qa/complex/ooxml/makefile.mk b/writerfilter/qa/complex/ooxml/makefile.mk
deleted file mode 100644
index b57a0f5279f5..000000000000
--- a/writerfilter/qa/complex/ooxml/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5.198.1 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..
-TARGET  = PropertyValues
-PRJNAME = $(TARGET)
-PACKAGE = complex$/ooxml
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = LoadDocuments.java
-JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS     = TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# build package name with "." instead of $/
-CT_PACKAGE  = -o $(PACKAGE:s\$/\.\)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-ALL: ALLTAR
-.ELSE
-ALL: ALLDEP
-.ENDIF
-
-.INCLUDE :  target.mk
-
-run: \
-    LoadDocuments
-
-RUN: run
-
-LoadDocuments:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) -tdoc $(PWD)$/testdocuments $(CT_PACKAGE).LoadDocuments
-
diff --git a/writerfilter/qa/cppunittests/doctok/makefile.mk b/writerfilter/qa/cppunittests/doctok/makefile.mk
deleted file mode 100644
index e7de9f8b4446..000000000000
--- a/writerfilter/qa/cppunittests/doctok/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=writerfilter
-TARGET=test-doctok
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:doctok by codegen.pl
-SHL1OBJS=  \
-       $(SLO)$/testdoctok.obj
-
-SHL1TARGET= testdoctok
-SHL1STDLIBS=\
-   $(SALLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-     $(TESTSHL2LIB)    \
-   $(CPPUNITLIB)
-
-SHL1LIBS=\
-    $(SLB)$/doctok.lib
-SHL1DEPS= \
-    $(SHL1LIBS)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= export.map
-# auto generated Target:doctok
-# END ------------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
new file mode 100644
index 000000000000..a5611ad39946
--- /dev/null
+++ b/writerfilter/source/Makefile
@@ -0,0 +1,202 @@
+#*************************************************************************
+#
+# 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
+
+# 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)
+	$(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)
+	$(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)
+	$(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)
+	$(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_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_token_tmp) : $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token.txt
+	cat $(SOLARVER)/$(INPATH)/inc$(UPDMINOREXT)/oox/token.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)
+	$(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)
+	$(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed) > $@
+
+$(wf_GEN_ooxml_Factory_cxx) : $(WFDIR)ooxml/factoryimpl.xsl $(wf_GEN_ooxml_Model_processed)
+	$(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed) > $@
+
+OOXMLFactory%.cxx : $(WFDIR)ooxml/factoryimpl_ns.xsl $(wf_GEN_ooxml_Model_processed)
+	$(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed) > $@
+
+OOXMLFactory%.hxx : $(WFDIR)ooxml/factory_ns.xsl $(wf_GEN_ooxml_Model_processed)
+	$(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed) > $@
+
+$(wf_GEN_ooxml_FactoryValues_hxx) : $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)
+	$(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)
+	$(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)
+	$(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)
+	$(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)
+	$(gb_XSLTPROC) $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed) \
+	| tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
+
+# 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=$(SOLARVER)/$(INPATH)/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)
+	$(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)
+	$(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)
+	$(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)
+	$(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_model_QNameToStr_cxx) \
+	$(wf_GEN_model_SprmCodeToStr_cxx) \
+	$(patsubst %,OOXMLFactory_%.hxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
+	$(patsubst %,OOXMLFactory_%.cxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
+
+#	$(wf_GEN_rtftok_scanner_cxx) \
+
+
diff --git a/writerfilter/source/dmapper/makefile.mk b/writerfilter/source/dmapper/makefile.mk
deleted file mode 100644
index a4b000411b4e..000000000000
--- a/writerfilter/source/dmapper/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-PRJNAME=writerfilter
-TARGET=dmapper
-GEN_HID=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
-
-# --- Files -------------------------------------
-
-SLOFILES= \
-    $(SLO)$/BorderHandler.obj \
-    $(SLO)$/CellColorHandler.obj \
-    $(SLO)$/CellMarginHandler.obj \
-    $(SLO)$/ConversionHelper.obj \
-    $(SLO)$/DomainMapper.obj \
-    $(SLO)$/DomainMapperTableHandler.obj \
-    $(SLO)$/DomainMapperTableManager.obj \
-    $(SLO)$/DomainMapper_Impl.obj \
-    $(SLO)$/FFDataHandler.obj \
-    $(SLO)$/FontTable.obj \
-    $(SLO)$/FormControlHelper.obj \
-    $(SLO)$/GraphicHelpers.obj \
-    $(SLO)$/GraphicImport.obj \
-    $(SLO)$/MeasureHandler.obj \
-    $(SLO)$/ModelEventListener.obj \
-    $(SLO)$/NumberingManager.obj  \
-    $(SLO)$/OLEHandler.obj \
-    $(SLO)$/PageBordersHandler.obj \
-    $(SLO)$/PropertyIds.obj \
-    $(SLO)$/PropertyMap.obj \
-    $(SLO)$/PropertyMapHelper.obj \
-    $(SLO)$/SectionColumnHandler.obj \
-    $(SLO)$/SettingsTable.obj \
-    $(SLO)$/StyleSheetTable.obj \
-    $(SLO)$/TDefTableHandler.obj \
-    $(SLO)$/TablePropertiesHandler.obj \
-    $(SLO)$/TblStylePrHandler.obj \
-    $(SLO)$/ThemeTable.obj \
-    $(SLO)$/WrapPolygonHandler.obj \
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-
diff --git a/writerfilter/source/doctok/makefile.mk b/writerfilter/source/doctok/makefile.mk
deleted file mode 100644
index ff03079f2c7a..000000000000
--- a/writerfilter/source/doctok/makefile.mk
+++ /dev/null
@@ -1,155 +0,0 @@
-#************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# ***********************************************************************/
-
-PRJ=..$/..
-PRJNAME=writerfilter
-TARGET=doctok
-#LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-#USE_DEFFILE=TRUE
-#EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
-
-#CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-#CDEFS+=-DDEBUG_DOCTOK_DUMP
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/WW8Annotation.obj \
-    $(SLO)$/WW8OutputWithDepth.obj \
-    $(SLO)$/WW8Text.obj \
-    $(SLO)$/DffImpl.obj \
-    $(SLO)$/Dff.obj \
-    $(SLO)$/WW8Picture.obj \
-    $(SLO)$/WW8Sttbf.obj \
-    $(SLO)$/WW8Table.obj \
-    $(SLO)$/WW8StyleSheet.obj \
-    $(SLO)$/WW8FontTable.obj \
-    $(SLO)$/WW8LFOTable.obj \
-    $(SLO)$/WW8ListTable.obj \
-    $(SLO)$/resources.obj \
-    $(SLO)$/WW8CpAndFc.obj \
-    $(SLO)$/WW8StructBase.obj \
-    $(SLO)$/WW8Clx.obj \
-    $(SLO)$/WW8FKPImpl.obj \
-    $(SLO)$/WW8BinTableImpl.obj \
-    $(SLO)$/WW8StreamImpl.obj \
-    $(SLO)$/WW8PropertySetImpl.obj \
-    $(SLO)$/WW8DocumentImpl.obj \
-    $(SLO)$/WW8PieceTableImpl.obj \
-    $(SLO)$/WW8ResourceModelImpl.obj
-
-
-SHL1TARGET=$(TARGET)
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ELIF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-RESOURCEMODELLIB=-lresourcemodel
-.ELSE
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ENDIF
-.ENDIF
-
-
-SHL1STDLIBS=$(SALLIB)\
-    $(CPPULIB)\
-    $(CPPUHELPERLIB) \
-    $(RESOURCEMODELLIB)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-DOCTOKHXXOUTDIR=$(INCCOM)/doctok
-DOCTOKCXXOUTDIR=$(MISC)
-DOCTOKHXXOUTDIRCREATED=$(DOCTOKHXXOUTDIR)/created
-
-DOCTOKMODEL=resources.xmi
-DOCTOKRESOURCESXSL=resources.xsl
-DOCTOKRESOURCESIMPLXSL=resourcesimpl.xsl
-DOCTOKRESOURCEIDSXSL=resourceids.xsl
-DOCTOKSPRMIDSXSL=sprmids.xsl
-DOCTOKRESOURCETOOLS=resourcetools.xsl
-
-DOCTOKRESOURCEIDSHXX=$(DOCTOKHXXOUTDIR)$/resourceids.hxx
-SPRMIDSHXX=$(DOCTOKHXXOUTDIR)$/sprmids.hxx
-RESOURCESHXX=$(DOCTOKHXXOUTDIR)$/resources.hxx
-RESOURCESCXX=$(DOCTOKCXXOUTDIR)$/resources.cxx
-
-DOCTOKGENHEADERS=$(DOCTOKRESOURCEIDSHXX) $(SPRMIDSHXX) $(RESOURCESHXX)
-DOCTOKGENFILES=$(DOCTOKGENHEADERS) $(RESOURCESCXX)
-
-$(DOCTOKHXXOUTDIRCREATED):
-    @$(MKDIRHIER) $(DOCTOKHXXOUTDIR)
-    @$(TOUCH) $@
-
-$(DOCTOKGENHEADERS): $(DOCTOKHXXOUTDIRCREATED)
-
-$(RESOURCESHXX): $(DOCTOKRESOURCESXSL) $(DOCTOKMODEL)
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCESXSL) $(DOCTOKMODEL) > $@
-
-$(SPRMIDSHXX): $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL)
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL) > $@
-
-$(RESOURCESCXX): $(DOCTOKRESOURCESIMPLXSL) $(DOCTOKMODEL) $(DOCTOKRESOURCEIDSHXX) $(DOCTOKRESOURCETOOLS)
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCESIMPLXSL) $(DOCTOKMODEL) > $@
-
-$(DOCTOKRESOURCEIDSHXX):  $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL)
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL) > $@
-
-$(SLOFILES) : $(DOCTOKGENHEADERS)
-
-.PHONY: genmake genclean
-
-genmake: $(DOCTOKGENFILES)
-
-genclean:
-    rm -f $(DOCTOKGENFILES)
-
-genheaders: $(DOCTOKGENHEADERS)
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index deede335d9af..97d5b3a74895 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -61,12 +61,14 @@ static struct ::cppu::ImplementationEntry s_component_entries [] =
     { 0, 0, 0, 0, 0, 0 } // terminate with NULL
 };
 
-void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL
+component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
 {
     return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries );
 }
diff --git a/writerfilter/source/generated.mk b/writerfilter/source/generated.mk
new file mode 100644
index 000000000000..39895d59f5b6
--- /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 \
+
+
diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk
deleted file mode 100644
index df0e26d1f467..000000000000
--- a/writerfilter/source/ooxml/makefile.mk
+++ /dev/null
@@ -1,256 +0,0 @@
-#************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# ***********************************************************************/
-
-PRJ=..$/..
-PRJNAME=writerfilter
-TARGET=ooxml
-#LIBTARGET=NO
-#USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
-
-#CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-
-NAMESPACES= \
-    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
-
-# --- Files --------------------------------------------------------
-
-SLOFACTORIESNAMESPACES= \
-    $(SLO)$/OOXMLFactory_{$(NAMESPACES)}.obj
-
-SLOFILES= \
-    $(SLOFACTORIESNAMESPACES) \
-    $(SLOFASTNAMESPACES) \
-    $(SLO)$/OOXMLFactory_generated.obj \
-    $(SLO)$/OOXMLFactory.obj \
-    $(SLO)$/OOXMLBinaryObjectReference.obj\
-    $(SLO)$/OOXMLFactory_values.obj \
-    $(SLO)$/OOXMLPropertySetImpl.obj \
-    $(SLO)$/OOXMLParserState.obj \
-    $(SLO)$/Handler.obj \
-    $(SLO)$/OOXMLDocumentImpl.obj \
-    $(SLO)$/OOXMLStreamImpl.obj \
-    $(SLO)$/OOXMLFastDocumentHandler.obj \
-    $(SLO)$/OOXMLFastContextHandler.obj \
-    $(SLO)$/OOXMLFastTokenHandler.obj
-
-SHL1TARGET=$(TARGET)
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ELIF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-RESOURCEMODELLIB=-lresourcemodel
-.ELSE
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ENDIF
-.ENDIF
-
-SHL1STDLIBS=$(SALLIB)\
-    $(CPPULIB)\
-    $(CPPUHELPERLIB) \
-    $(COMPHELPERLIB) \
-    $(RESOURCEMODELLIB)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.PHONY : test
-
-test:
-    echo $(SLOFILES)
-
-OOXMLCXXOUTDIR=$(MISC)
-OOXMLHXXOUTDIR=$(INCCOM)/ooxml
-OOXMLHXXOUTDIRCREATED=$(OOXMLHXXOUTDIR)/created
-
-OOXMLFACTORYCXXS=$(OOXMLCXXOUTDIR)$/OOXMLFactory_{$(NAMESPACES)}.cxx
-OOXMLFACTORYHXXS=$(OOXMLHXXOUTDIR)$/OOXMLFactory_{$(NAMESPACES)}.hxx
-
-OOXMLMODEL=model.xml
-OOXMLPREPROCESSXSL=modelpreprocess.xsl
-OOXMLFACTORYTOOLSXSL=factorytools.xsl
-OOXMLRESORUCETOKENSXSL=resourcestokens.xsl
-OOXMLFASTTOKENSXSL=fasttokens.xsl
-OOXMLRESOURCESIMPLXSL=resourcesimpl.xsl
-OOXMLNAMESPACEIDSXSL=namespaceids.xsl
-OOXMLFACTORYVALUESXSL=factory_values.xsl
-OOXMLFACTORYVALUESIMPLXSL=factoryimpl_values.xsl
-OOXMLRESOURCEIDSXSL=resourceids.xsl
-OOXMLGPERFFASTTOKENXSL=gperffasttokenhandler.xsl
-
-OOXMLRESOURCEIDSHXX=$(OOXMLHXXOUTDIR)$/resourceids.hxx
-
-TOKENXML=$(OOXMLCXXOUTDIR)$/token.xml
-TOKENXMLTMP=$(OOXMLCXXOUTDIR)$/token.tmp
-
-OOXMLFACTORYGENERATEDHXX=$(OOXMLHXXOUTDIR)$/OOXMLFactory_generated.hxx
-OOXMLFACTORYGENERATEDCXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_generated.cxx
-OOXMLFASTTOKENSHXX=$(OOXMLHXXOUTDIR)$/OOXMLFastTokens.hxx
-OOXMLNAMESPACEIDSHXX=$(OOXMLHXXOUTDIR)$/OOXMLnamespaceids.hxx
-OOXMLFACTORYVALUESHXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_values.hxx
-OOXMLFACTORYVALUESCXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_values.cxx
-GPERFFASTTOKENHXX=$(OOXMLHXXOUTDIR)$/gperffasttoken.hxx
-MODELPROCESSED=$(MISC)$/model_preprocessed.xml
-
-OOXMLGENHEADERS= \
-    $(OOXMLFACTORYGENERATEDHXX) \
-    $(OOXMLFACTORYHXXS) \
-    $(OOXMLFASTTOKENSHXX) \
-    $(OOXMLFACTORYVALUESHXX) \
-    $(GPERFFASTTOKENHXX) \
-    $(OOXMLRESOURCEIDSHXX) \
-    $(OOXMLNAMESPACEIDSHXX)
-
-GENERATEDFILES= \
-    $(OOXMLGENHEADERS) \
-    $(OOXMLFACTORYGENERATEDCXX) \
-    $(OOXMLFACTORYCXXS) \
-    $(OOXMLFACTORYVALUESCXX) \
-    $(TOKENXMLTMP) \
-    $(TOKENXML)
-
-$(TOKENXMLTMP): $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token$/tokens.txt
-    @$(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token$/tokens.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
-
-$(TOKENXML): tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter
-    @$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
-
-$(OOXMLHXXOUTDIRCREATED):
-    $(MKDIRHIER) $(OOXMLHXXOUTDIR)
-    @$(TOUCH) $@
-
-$(OOXMLGENHEADERS): $(OOXMLHXXOUTDIRCREATED)
-
-$(OOXMLFASTTOKENSHXX): $(OOXMLFASTTOKENSXSL) $(TOKENXML)
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFASTTOKENSXSL) $(TOKENXML) > $@
-
-$(OOXMLFACTORYGENERATEDHXX): factoryinc.xsl
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $< $(MODELPROCESSED) > $@
-
-$(OOXMLFACTORYGENERATEDCXX): factoryimpl.xsl
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $< $(MODELPROCESSED) > $@
-
-$(OOXMLFACTORYGENERATEDCXX): $(MODELPROCESSED)
-
-$(OOXMLFACTORYGENERATEDHXX): $(MODELPROCESSED)
-
-$(OOXMLFACTORYCXXS): $(MODELPROCESSED)
-
-$(OOXMLFACTORYHXXS): $(MODELPROCESSED)
-
-$(OOXMLCXXOUTDIR)$/OOXMLFactory%.cxx: factoryimpl_ns.xsl
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) --stringparam file $@ $< $(MODELPROCESSED) > $@
-
-$(OOXMLHXXOUTDIR)$/OOXMLFactory%.hxx: factory_ns.xsl
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) --stringparam file $@ $< $(MODELPROCESSED) > $@
-
-$(OOXMLFACTORYVALUESHXX): $(OOXMLFACTORYVALUESXSL) $(MODELPROCESSED)
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFACTORYVALUESXSL) $(MODELPROCESSED) > $@
-
-$(OOXMLFACTORYVALUESCXX): $(OOXMLFACTORYVALUESIMPLXSL) $(MODELPROCESSED)
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFACTORYVALUESIMPLXSL) $(MODELPROCESSED) > $@
-
-$(OOXMLRESOURCEIDSHXX):  $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCEIDSXSL) \
-    $(MODELPROCESSED)
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) > $@
-
-$(OOXMLNAMESPACEIDSHXX):  $(OOXMLHXXOUTDIRCREATED) $(OOXMLNAMESPACEIDSXSL) \
-    $(MODELPROCESSED)
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLNAMESPACEIDSXSL) $(MODELPROCESSED) > $@
-
-$(GPERFFASTTOKENHXX): $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED)
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
-
-$(SLOFACTORIESNAMESPACES): $(OOXMLFACTORYSCXXS) $(OOXMLGENHEADERS)
-
-$(GENERATEDFILES): $(OOXMLFACTORYTOOLSXSL)
-
-$(SLOFILES): $(OOXMLGENHEADERS)
-
-$(SLO)/OOXMLFactory_values.obj: $(OOXMLFACTORYVALUESCXX) $(OOXMLFACTORYVALUESHXX)
-
-$(SLO)$/OOXMLFactory_generated.obj: $(OOXMLFACTORYGENERATEDCXX) $(OOXMLGENHEADERS)
-
-.PHONY: genclean genmake genheaders
-
-genclean:
-    rm -f $(GENERATEDFILES)
-
-genmake: $(GENERATEDFILES)
-
-genheaders: $(GENHEADERS)
diff --git a/writerfilter/source/resourcemodel/makefile.mk b/writerfilter/source/resourcemodel/makefile.mk
deleted file mode 100644
index cf7941b3ed1c..000000000000
--- a/writerfilter/source/resourcemodel/makefile.mk
+++ /dev/null
@@ -1,207 +0,0 @@
-#************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# ***********************************************************************/
-
-PRJ=..$/..
-PRJNAME=writerfilter
-TARGET=resourcemodel
-#LIBTARGET=NO
-#USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
-
-#CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
-#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
-
-
-# --- Files --------------------------------------------------------
-
-# work around gcc taking hours and/or OOM'ing on this file
-NOOPTFILES= \
-    $(SLO)$/qnametostr.obj
-
-SLOFILES= \
-    $(SLO)$/Fraction.obj \
-    $(SLO)$/LoggedResources.obj \
-    $(SLO)$/Protocol.obj \
-    $(SLO)$/ResourceModelHelper.obj \
-    $(SLO)$/TagLogger.obj \
-    $(SLO)$/WW8Analyzer.obj \
-    $(SLO)$/XPathLogger.obj \
-    $(SLO)$/qnametostr.obj \
-    $(SLO)$/resourcemodel.obj \
-    $(SLO)$/sprmcodetostr.obj \
-    $(SLO)$/util.obj \
-
-# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
-.IF "$(OUTPATH)"=="unxlngx6"
-NOOPTFILES= \
-    $(SLO)$/qnametostr.obj
-.ENDIF
-
-SHL1TARGET=$(TARGET)
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-RTFTOKLIB=-lrtftok
-DOCTOKLIB=-ldoctok
-OOXMLLIB=-looxml
-.ELIF "$(GUI)"=="WNT"
-RTFTOKLIB=$(LB)$/irtftok.lib
-DOCTOKLIB=$(LB)$/idoctok.lib
-OOXMLLIB=$(LB)$/iooxml.lib
-.ENDIF
-
-SHL1STDLIBS=$(SALLIB)\
-    $(CPPULIB)\
-    $(CPPUHELPERLIB) \
-    $(COMPHELPERLIB)
-
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-RESOURCEMODELCXXOUTDIR=$(MISC)
-DOCTOKHXXOUTDIR=$(INCCOM)$/doctok
-OOXMLHXXOUTDIR=$(INCCOM)$/ooxml
-
-DOCTOKHXXOUTDIRCREATED=$(DOCTOKHXXOUTDIR)$/created
-OOXMLHXXOUTDIRCREATED=$(OOXMLHXXOUTDIR)$/created
-
-OOXMLMODEL=..$/ooxml$/model.xml
-OOXMLPREPROCESSXSL=..$/ooxml$/modelpreprocess.xsl
-OOXMLPREPROCESSXSLCOPIED=$(MISC)$/modelpreprocess.xsl
-OOXMLQNAMETOSTRXSL=..$/ooxml$/qnametostr.xsl
-OOXMLANALYZERXSL=..$/ooxml$/analyzer.xsl
-OOXMLRESOURCEIDSXSL=..$/ooxml$/resourceids.xsl
-OOXMLFACTORYTOOLSXSL=..$/ooxml$/factorytools.xsl
-DOCTOKMODEL=..$/doctok$/resources.xmi
-DOCTOKQNAMETOSTRXSL=..$/doctok$/qnametostr.xsl
-DOCTOKANALYZERXSL=..$/doctok$/analyzer.xsl
-DOCTOKSPRMCODETOSTRXSL=..$/doctok$/sprmcodetostr.xsl
-DOCTOKRESOURCEIDSXSL=..$/doctok$/resourceids.xsl
-DOCTOKSPRMIDSXSL=..$/doctok$/sprmids.xsl
-DOCTOKRESOURCETOOLS=..$/doctok$/resourcetools.xsl
-
-NSPROCESS=namespace_preprocess.pl
-
-MODELPROCESSED=$(MISC)$/model_preprocessed.xml
-
-QNAMETOSTRCXX=$(RESOURCEMODELCXXOUTDIR)$/qnametostr.cxx
-OOXMLQNAMETOSTRTMP=$(RESOURCEMODELCXXOUTDIR)$/OOXMLqnameToStr.tmp
-DOCTOKQNAMETOSTRTMP=$(RESOURCEMODELCXXOUTDIR)$/DOCTOKqnameToStr.tmp
-SPRMCODETOSTRCXX=$(RESOURCEMODELCXXOUTDIR)$/sprmcodetostr.cxx
-SPRMCODETOSTRTMP=$(RESOURCEMODELCXXOUTDIR)$/sprmcodetostr.tmp
-DOCTOKRESOURCEIDSHXX=$(DOCTOKHXXOUTDIR)$/resourceids.hxx
-SPRMIDSHXX=$(DOCTOKHXXOUTDIR)$/sprmids.hxx
-OOXMLRESOURCEIDSHXX=$(OOXMLHXXOUTDIR)$/resourceids.hxx
-
-NSXSL=$(MISC)$/namespacesmap.xsl
-NAMESPACESTXT=$(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token$/namespaces.txt
-
-GENERATEDHEADERS=$(DOCTOKRESOURCEIDSHXX) $(OOXMLRESOURCEIDSHXX) $(SPRMIDSHXX)
-GENERATEDFILES= \
-    $(GENERATEDHEADERS) \
-    $(QNAMETOSTRCXX) \
-    $(SPRMCODETOSTRCXX) \
-    $(MODELPROCESSED) \
-    $(OOXMLQNAMETOSTRTMP) \
-    $(DOCTOKQNAMETOSTRTMP) \
-    $(SPRMCODETOSTRTMP)
-
-$(OOXMLQNAMETOSTRTMP): $(OOXMLQNAMETOSTRXSL) $(MODELPROCESSED)
-    @echo "Making:   " $(@:f)   
-    $(XSLTPROC) $(OOXMLQNAMETOSTRXSL:s!\!/!) $(MODELPROCESSED) > $@
-
-$(DOCTOKQNAMETOSTRTMP): $(DOCTOKQNAMETOSTRXSL) $(DOCTOKMODEL)
-    @echo "Making:   " $(@:f)   
-    $(XSLTPROC) $(DOCTOKQNAMETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
-
-$(QNAMETOSTRCXX): $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrheader qnametostrfooter $(OOXMLFACTORYTOOLSXSL) $(DOCTOKRESOURCETOOLS)
-    @$(TYPE) qnametostrheader $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrfooter > $@
-
-$(SPRMCODETOSTRTMP): $(DOCTOKSPRMCODETOSTRXSL) $(DOCTOKMODEL)
-    @echo "Making:   " $(@:f)   
-    $(XSLTPROC) $(DOCTOKSPRMCODETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
-
-$(SPRMCODETOSTRCXX): sprmcodetostrheader $(SPRMCODETOSTRTMP) sprmcodetostrfooter
-    @$(TYPE) $< > $@
-
-$(SLO)$/sprmcodetostr.obj: $(SPRMCODETOSTRCXX)
-$(SLO)$/qnametostr.obj: $(QNAMETOSTRCXX)
-
-$(SLOFILES): $(GENERATEDHEADERS)
-
-$(DOCTOKHXXOUTDIRCREATED):
-    @$(MKDIRHIER) $(DOCTOKHXXOUTDIR)
-    @$(TOUCH) $@
-
-$(DOCTOKRESOURCEIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKRESOURCETOOLS) $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL)
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCEIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
-
-$(OOXMLHXXOUTDIRCREATED):
-    @$(MKDIRHIER) $(OOXMLHXXOUTDIR)
-    @$(TOUCH) $@
-
-$(OOXMLPREPROCESSXSLCOPIED): $(OOXMLPREPROCESSXSL)
-    @$(COPY) $(OOXMLPREPROCESSXSL) $@
-
-$(NSXSL) : $(OOXMLMODEL) $(NAMESPACESTXT) $(NSPROCESS)
-    @$(PERL) $(NSPROCESS) $(NAMESPACESTXT) > $@
-
-$(MODELPROCESSED): $(NSXSL) $(OOXMLPREPROCESSXSLCOPIED) $(OOXMLMODEL)
-    @echo "Making:   " $(@:f)
-    $(COMMAND_ECHO)$(XSLTPROC) $(NSXSL) $(OOXMLMODEL) > $@
-
-$(OOXMLRESOURCEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLFACTORYTOOLSXSL) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED)
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLRESOURCEIDSXSL:s!\!/!) $(MODELPROCESSED) > $@
-
-$(SPRMIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL)
-    @echo "Making:   " $(@:f)   
-    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKSPRMIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
-
-.PHONY: genclean genmake gendirs
-
-genclean: 
-    rm -f $(GENERATEDFILES)
-
-genmake: $(GENERATEDFILES)
-
diff --git a/writerfilter/source/rtftok/makefile.mk b/writerfilter/source/rtftok/makefile.mk
deleted file mode 100644
index 61399f051e15..000000000000
--- a/writerfilter/source/rtftok/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# ***********************************************************************/
-
-PRJ=..$/..
-PRJNAME=writerfilter
-TARGET=rtftok
-#LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-#USE_DEFFILE=TRUE
-EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/writerfilter.mk
-
-#CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 
-#CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=$(SLO)$/RTFScanner.obj $(SLO)$/RTFParseException.obj
-
-
-SHL1TARGET=$(TARGET)
-
-SHL1STDLIBS=$(SALLIB)\
-    $(CPPULIB)\
-    $(CPPUHELPERLIB)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1OBJS=$(SLOFILES) 
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-RTFSCANNERCXX=$(MISC)/RTFScanner.cxx
-
-GENERATEDFILES=$(RTFSCANNERCXX)
-
-$(RTFSCANNERCXX): RTFScanner.lex RTFScanner.skl FlexLexer.h
-    flex -+ -SRTFScanner.skl -o$@ RTFScanner.lex
-
-$(SLO)/RTFScanner.obj: $(RTFSCANNERCXX)
-
-.PHONY: genmake genclean
-
-genmake: $(GENERATEDFILES)
-
-genclean:
-    rm $(GENERATEDFILES)
diff --git a/writerfilter/unocomponent/component.cxx b/writerfilter/unocomponent/component.cxx
index 06e837ef4cd6..997b201e7970 100644
--- a/writerfilter/unocomponent/component.cxx
+++ b/writerfilter/unocomponent/component.cxx
@@ -25,14 +25,9 @@
  *
  ************************************************************************/
 
-#ifndef _CPPUHELPTER_FACTORY_
-#include <cppuhelper/factory.hxx>
-#endif
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_
+#include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <debugservices/doctok/DocTokTestService.hxx>
 #include <debugservices/doctok/DocTokAnalyzeService.hxx>
 #include <debugservices/ooxml/OOXMLTestService.hxx>
@@ -56,12 +51,14 @@ static struct ::cppu::ImplementationEntry s_component_entries [] =
 };
 
 
-    void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL
+component_getFactory(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
 {
     fprintf(stderr, "Loading service: %s: ", implName);
 
diff --git a/writerfilter/unocomponent/debugservices/ooxml/makefile.mk b/writerfilter/unocomponent/debugservices/ooxml/makefile.mk
deleted file mode 100644
index 25835aede106..000000000000
--- a/writerfilter/unocomponent/debugservices/ooxml/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# ***********************************************************************/
-PRJ=..$/..$/..
-PRJNAME=writerfilter
-TARGET=debugservices_ooxml
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-RESSOUREMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-RESOURCEMODELLIB=-lresourcemodel
-.ELSE
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ENDIF
-.ENDIF
-
-SHL1STDLIBS= \
-    $(COMPHELPERLIB) \
-    $(RESOURCEMODELLIB)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/OOXMLTestService.obj \
-    $(SLO)$/OOXMLAnalyzeService.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/writerfilter/unocomponent/makefile.mk b/writerfilter/unocomponent/makefile.mk
deleted file mode 100644
index a01d391e88fb..000000000000
--- a/writerfilter/unocomponent/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# ***********************************************************************/
-PRJ=..
-PRJNAME=writerfilter
-TARGET=writerfilter.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=$(SLO)$/component.obj
-
-SHL1TARGET=$(TARGET)
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-DOCTOKLIB=-ldoctok
-OOXMLLIB=-looxml
-RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-DOCTOKLIB=$(LB)$/idoctok.lib
-OOXMLLIB=$(LB)$/iooxml.lib
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ELIF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-DOCTOKLIB=-ldoctok
-OOXMLLIB=-looxml
-RESOURCEMODELLIB=-lresourcemodel
-.ELSE
-DOCTOKLIB=$(LB)$/idoctok.lib
-OOXMLLIB=$(LB)$/iooxml.lib
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
-.ENDIF
-.ENDIF
-
-SHL1STDLIBS=$(SALLIB)\
-    $(CPPULIB)\
-    $(COMPHELPERLIB)\
-    $(CPPUHELPERLIB)\
-    $(UCBHELPERLIB)\
-    $(DOCTOKLIB) \
-    $(OOXMLLIB) \
-    $(RESOURCEMODELLIB)
-
-SHL1LIBS=\
-    $(SLB)$/debugservices_doctok.lib \
-    $(SLB)$/debugservices_ooxml.lib
-
-SHL1IMPLIB=i$(SHL1TARGET)
-
-SHL1OBJS = $(SLO)$/component.obj
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/writerfilter/util/makefile.mk b/writerfilter/util/makefile.mk
deleted file mode 100644
index c2f5c9ee37e1..000000000000
--- a/writerfilter/util/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-# ***********************************************************************/
-
-PRJ=..
-PRJNAME=writerfilter
-TARGET=writerfilter
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES=  \
-    $(SLB)$/ooxml.lib \
-    $(SLB)$/doctok.lib \
-    $(SLB)$/resourcemodel.lib \
-    $(SLB)$/dmapper.lib \
-    $(SLB)$/filter.lib
-
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1STDLIBS=\
-    $(I18NISOLANGLIB) \
-    $(I18NPAPERLIB) \
-    $(SOTLIB) \
-    $(TOOLSLIB) \
-    $(UNOTOOLSLIB) \
-    $(CPPUHELPERLIB)    \
-    $(COMPHELPERLIB)    \
-    $(CPPULIB)          \
-    $(SALLIB)			\
-    $(OOXLIB)
-
-
-SHL1DEPN=
-SHL1IMPLIB= i$(SHL1TARGET)
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/writerfilter.component
-
-$(MISC)/writerfilter.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt writerfilter.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt writerfilter.component