diff --git a/writerfilter/source/ooxml/values.xsl b/writerfilter/source/ooxml/factory_values.xsl
similarity index 86%
rename from writerfilter/source/ooxml/values.xsl
rename to writerfilter/source/ooxml/factory_values.xsl
index 414bd89aa0af..a95be77fa522 100644
--- a/writerfilter/source/ooxml/values.xsl
+++ b/writerfilter/source/ooxml/factory_values.xsl
@@ -7,7 +7,7 @@
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: values.xsl,v $
+  $RCSfile: fastresources_wml.xsl,v $
  
   $Revision: 1.3 $
  
@@ -68,25 +68,12 @@
   <xsl:include href="resourcestools.xsl"/>
 
   <xsl:template match="/">
-    <out xml:space="preserve">
-      <xsl:call-template name="licenseheader"/>
-      <xsl:text>
-#ifndef INCLUDED_OOXML_VALUES_HXX
-#define INCLUDED_OOXML_VALUES_HXX
-
+    <xsl:text>
+#ifndef INCLUDED_FACTORY_VALUES</xsl:text>
 #include &lt;rtl/ustring.hxx&gt;
-#include "OOXMLPropertySetImpl.hxx"
 
-namespace writerfilter {
-namespace ooxml {
-
-/// @cond GENERATED
-      </xsl:text>
-      <xsl:call-template name="valuedecls"/>
-      <xsl:text>
-/// @endcond
-}}
-#endif //INCLUDED_OOXML_VALUES_HXX&#xa;</xsl:text></out></xsl:template>
-
-  <xsl:template match="*"/>
+<xsl:call-template name="valueconstantdecls"/>
+<xsl:text>
+#endif // INCLUDED_FACTORY_VALUES&#xa;</xsl:text>
+  </xsl:template>
 </xsl:stylesheet>
diff --git a/writerfilter/source/ooxml/factoryimpl.xsl b/writerfilter/source/ooxml/factoryimpl.xsl
index d6b80fd6fe7e..aa8adbeb0d41 100644
--- a/writerfilter/source/ooxml/factoryimpl.xsl
+++ b/writerfilter/source/ooxml/factoryimpl.xsl
@@ -70,7 +70,11 @@
   <xsl:template match="/">
     <xsl:text>    
 #include "OOXMLFactory.hxx"
-#include "OOXMLFastHelper.hxx"</xsl:text>
+#include "OOXMLFastHelper.hxx"
+#include "OOXMLStreamImpl.hxx"
+#include "doctok/sprmids.hxx"
+#include "doctok/resourceids.hxx"
+</xsl:text>
     <xsl:call-template name="factoryincludes"/>
     <xsl:text>
 namespace writerfilter {
@@ -81,6 +85,9 @@ namespace ooxml {
     <xsl:call-template name="factorycreatecontextfromfactory"/>
     <xsl:call-template name="factoryfornamespace"/>
     <xsl:call-template name="factorycreatefromstart"/>
+    <xsl:call-template name="fasttokentoid"/>
+    <xsl:call-template name="sprmkind"/>
+    <xsl:call-template name="getfastparser"/>
     <xsl:text>
 /// @endcond
 }}
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index 53634cef9012..163e58815841 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -71,8 +71,9 @@
     <xsl:variable name="ns" select="substring-before(substring-after($file, 'OOXMLFactory_'), '.cxx')"/>
     <xsl:text>
 #include "doctok/sprmids.hxx"
+#include "doctok/resourceids.hxx"
 #include "ooxml/resourceids.hxx"
-#include "OOXMLfastresources.hxx"
+#include "OOXMLFactory_values.hxx"
 #include "OOXMLFactory_</xsl:text>
     <xsl:value-of select="$ns"/>
     <xsl:text>.hxx"
diff --git a/writerfilter/source/ooxml/valuesimpl.xsl b/writerfilter/source/ooxml/factoryimpl_values.xsl
similarity index 84%
rename from writerfilter/source/ooxml/valuesimpl.xsl
rename to writerfilter/source/ooxml/factoryimpl_values.xsl
index c4b40b71fd2d..ef976809a6b8 100644
--- a/writerfilter/source/ooxml/valuesimpl.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_values.xsl
@@ -7,7 +7,7 @@
  
   OpenOffice.org - a multi-platform office productivity suite
  
-  $RCSfile: valuesimpl.xsl,v $
+  $RCSfile: fastresources_wml.xsl,v $
  
   $Revision: 1.3 $
  
@@ -68,22 +68,8 @@
   <xsl:include href="resourcestools.xsl"/>
 
   <xsl:template match="/">
-    <out xml:space="preserve">
-      <xsl:call-template name="licenseheader"/>
-      <xsl:text>
-#include &lt;iostream&gt;
-#include &lt;doctok/resourceids.hxx&gt;
-#include &lt;ooxml/resourceids.hxx&gt;
-#include "OOXMLvalues.hxx"
-#include "OOXMLPropertySetImpl.hxx"
-
-namespace writerfilter {
-namespace ooxml {
-using namespace ::std;
-      </xsl:text>
-      <xsl:call-template name="valueconstants"/>
-      <xsl:call-template name="valueimpls"/>
-      <xsl:text>
-}}&#xa;</xsl:text></out></xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
+    <xsl:text>
+#include "OOXMLFactory_values.hxx"</xsl:text>
+<xsl:call-template name="valueconstants"/>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/writerfilter/source/ooxml/fastresources.xsl b/writerfilter/source/ooxml/fastresources.xsl
deleted file mode 100644
index 7e537d1881f4..000000000000
--- a/writerfilter/source/ooxml/fastresources.xsl
+++ /dev/null
@@ -1,120 +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: fastresources.xsl,v $
- 
-  $Revision: 1.5 $
- 
-  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.
- 
- ************************************************************************/
-
--->
-<xsl:stylesheet 
-    version="1.0" 
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
-    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
-    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
-    xmlns:xlink="http://www.w3.org/1999/xlink" 
-    xmlns:dc="http://purl.org/dc/elements/1.1/" 
-    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
-    xmlns:math="http://www.w3.org/1998/Math/MathML" 
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
-    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
-    xmlns:ooo="http://openoffice.org/2004/office" 
-    xmlns:ooow="http://openoffice.org/2004/writer" 
-    xmlns:oooc="http://openoffice.org/2004/calc" 
-    xmlns:dom="http://www.w3.org/2001/xml-events" 
-    xmlns:xforms="http://www.w3.org/2002/xforms" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  
-    xmlns:rng="http://relaxng.org/ns/structure/1.0"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" 
-    xmlns:UML = 'org.omg.xmi.namespace.UML' xml:space="default">
-  <xsl:output method="text" />
-  <xsl:param name="prefix"/>
-  
-  <xsl:include href="resourcestools.xsl"/>
-
-  <xsl:template match="/">
-    <xsl:call-template name="licenseheader"/>
-    <xsl:text>
-#ifndef INCLUDED_OOXML_RESOURCES_HXX
-#define INCLUDED_OOXML_RESOURCES_HXX
-
-#include &lt;vector&gt;
-#include &lt;boost/shared_ptr.hpp&gt;
-#include &lt;string&gt;
-
-#include &lt;resourcemodel/WW8ResourceModel.hxx&gt;
-#include &lt;resourcemodel/TagLogger.hxx&gt;
-#include &lt;doctok/resourceids.hxx&gt;
-#include &lt;ooxml/resourceids.hxx&gt;
-#include &lt;ooxml/OOXMLnamespaceids.hxx&gt;
-#include "OOXMLFastContextHandler.hxx"
-#include "OOXMLFastTokens.hxx"
-#include "OOXMLStreamImpl.hxx"</xsl:text>
-      <xsl:for-each select="//namespace">
-        <xsl:text>
-#include "OOXMLfastresources_</xsl:text>
-<xsl:value-of select="@name"/>
-<xsl:text>.hxx"</xsl:text>
-      </xsl:for-each>
-      <xsl:text>
-
-namespace writerfilter {
-namespace ooxml {
-
-extern TagLogger::Pointer_t debug_logger;
-
-using namespace ::std;
-using namespace ::com::sun::star;
-
-uno::Reference &lt; xml::sax::XFastContextHandler &gt; 
-createFromStart(::sal_Int32 Element); 
-void dumpAttribs
-(const uno::Reference &lt; xml::sax::XFastAttributeList &gt; &amp; Attribs)
-        throw (uno::RuntimeException, xml::sax::SAXException);
-
-
-/// @cond GENERATED
-      </xsl:text>
-      <xsl:call-template name="valueconstantdecls"/>
-      <xsl:text>
-/// @endcond
-}}
-#endif //INCLUDED_OOXML_RESOURCES_HXX&#xa;</xsl:text></xsl:template>
-
-  <xsl:template match="*"/>
-</xsl:stylesheet>
diff --git a/writerfilter/source/ooxml/fastresources_.xsl b/writerfilter/source/ooxml/fastresources_.xsl
deleted file mode 100644
index 5d24a01fd240..000000000000
--- a/writerfilter/source/ooxml/fastresources_.xsl
+++ /dev/null
@@ -1,103 +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: fastresources_.xsl,v $
- 
-  $Revision: 1.3 $
- 
-  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.
- 
- ************************************************************************/
-
--->
-<xsl:stylesheet 
-    version="1.0" 
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
-    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
-    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
-    xmlns:xlink="http://www.w3.org/1999/xlink" 
-    xmlns:dc="http://purl.org/dc/elements/1.1/" 
-    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
-    xmlns:math="http://www.w3.org/1998/Math/MathML" 
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
-    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
-    xmlns:ooo="http://openoffice.org/2004/office" 
-    xmlns:ooow="http://openoffice.org/2004/writer" 
-    xmlns:oooc="http://openoffice.org/2004/calc" 
-    xmlns:dom="http://www.w3.org/2001/xml-events" 
-    xmlns:xforms="http://www.w3.org/2002/xforms" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  
-    xmlns:rng="http://relaxng.org/ns/structure/1.0"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" 
-    xmlns:UML = 'org.omg.xmi.namespace.UML' xml:space="default">
-  <xsl:output method="text" />
-  <xsl:param name="prefix"/>
-  
-  <xsl:include href="resourcestools.xsl"/>
-
-  <xsl:template match="/">
-    <xsl:call-template name="licenseheader"/>
-    <xsl:text>
-#ifndef INCLUDED_OOXML_FASTRESOURCES_WML_HXX
-#define INCLUDED_OOXML_FASTRESOURCES_WML_HXX
-
-#include &lt;vector&gt;
-#include &lt;boost/shared_ptr.hpp&gt;
-#include &lt;string&gt;
-
-#include &lt;resourcemodel/WW8ResourceModel.hxx&gt;
-#include "OOXMLFastContextHandler.hxx"
-#include "OOXMLFastTokens.hxx"
-#include "OOXMLStreamImpl.hxx"
-
-namespace writerfilter {
-namespace ooxml {
-using namespace ::std;
-using namespace ::com::sun::star;
-using namespace doctok;
-
-/// @cond GENERATED
-    </xsl:text>
-    <xsl:call-template name="fastcontextdecls">
-      <xsl:with-param name="namespace">wml</xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>
-/// @endcond
-}}
-#endif //INCLUDED_OOXML_FASTRESOURCES_WML_HXX&#xa;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="*"/>
-</xsl:stylesheet>
diff --git a/writerfilter/source/ooxml/fastresources_ns.xsl b/writerfilter/source/ooxml/fastresources_ns.xsl
deleted file mode 100644
index dee4fa927b4b..000000000000
--- a/writerfilter/source/ooxml/fastresources_ns.xsl
+++ /dev/null
@@ -1,113 +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: fastresources_wml.xsl,v $
- 
-  $Revision: 1.3 $
- 
-  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.
- 
- ************************************************************************/
-
--->
-<xsl:stylesheet 
-    version="1.0" 
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
-    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
-    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
-    xmlns:xlink="http://www.w3.org/1999/xlink" 
-    xmlns:dc="http://purl.org/dc/elements/1.1/" 
-    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
-    xmlns:math="http://www.w3.org/1998/Math/MathML" 
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
-    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
-    xmlns:ooo="http://openoffice.org/2004/office" 
-    xmlns:ooow="http://openoffice.org/2004/writer" 
-    xmlns:oooc="http://openoffice.org/2004/calc" 
-    xmlns:dom="http://www.w3.org/2001/xml-events" 
-    xmlns:xforms="http://www.w3.org/2002/xforms" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  
-    xmlns:rng="http://relaxng.org/ns/structure/1.0"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" 
-    xmlns:UML = 'org.omg.xmi.namespace.UML' xml:space="default">
-  <xsl:output method="text" />
-  <xsl:param name="prefix"/>
-  
-  <xsl:include href="resourcestools.xsl"/>
-
-  <xsl:template match="/">
-    <xsl:variable name="ns" select="substring-before(substring-after($file, 'OOXMLfastresources_'), '.hxx')"/>
-    <xsl:variable name="incguard">
-      <xsl:text>INCLUDED_OOXML_FASTRESOURCES_</xsl:text>
-      <xsl:value-of select="translate($ns, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-      <xsl:text>_HXX</xsl:text>
-    </xsl:variable>
-    <xsl:call-template name="licenseheader"/>
-    <xsl:text>
-#ifndef </xsl:text>
-    <xsl:value-of select="$incguard"/>
-    <xsl:text>
-#define </xsl:text>
-    <xsl:value-of select="$incguard"/>
-    <xsl:text>
-#include &lt;vector&gt;
-#include &lt;boost/shared_ptr.hpp&gt;
-#include &lt;string&gt;
-
-#include &lt;resourcemodel/WW8ResourceModel.hxx&gt;
-#include "OOXMLFastContextHandler.hxx"
-#include "OOXMLFastTokens.hxx"
-#include "OOXMLStreamImpl.hxx"
-
-namespace writerfilter {
-namespace ooxml {
-using namespace ::std;
-using namespace ::com::sun::star;
-
-/// @cond GENERATED
-    </xsl:text>
-    <xsl:call-template name="fastcontextdecls">
-      <xsl:with-param name="namespace" select="$ns"/>
-    </xsl:call-template>
-    <xsl:text>
-/// @endcond
-}}
-#endif //</xsl:text>
-    <xsl:value-of select="$incguard"/>
-    <xsl:text>&#xa;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="*"/>
-</xsl:stylesheet>
diff --git a/writerfilter/source/ooxml/fastresourcesimpl.xsl b/writerfilter/source/ooxml/fastresourcesimpl.xsl
deleted file mode 100644
index 7b5e6429a032..000000000000
--- a/writerfilter/source/ooxml/fastresourcesimpl.xsl
+++ /dev/null
@@ -1,99 +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: fastresourcesimpl.xsl,v $
- 
-  $Revision: 1.3 $
- 
-  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.
- 
- ************************************************************************/
-
--->
-<xsl:stylesheet 
-    version="1.0" 
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
-    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
-    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
-    xmlns:xlink="http://www.w3.org/1999/xlink" 
-    xmlns:dc="http://purl.org/dc/elements/1.1/" 
-    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
-    xmlns:math="http://www.w3.org/1998/Math/MathML" 
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
-    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
-    xmlns:ooo="http://openoffice.org/2004/office" 
-    xmlns:ooow="http://openoffice.org/2004/writer" 
-    xmlns:oooc="http://openoffice.org/2004/calc" 
-    xmlns:dom="http://www.w3.org/2001/xml-events" 
-    xmlns:xforms="http://www.w3.org/2002/xforms" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  
-    xmlns:rng="http://relaxng.org/ns/structure/1.0"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" 
-    xmlns:UML = 'org.omg.xmi.namespace.UML' xml:space="default">
-  <xsl:output method="text" />
-  <xsl:param name="prefix"/>
-  
-  <xsl:include href="resourcestools.xsl"/>
-
-  <xsl:template match="/">
-    <out xml:space="preserve">
-      <xsl:call-template name="licenseheader"/>
-      <xsl:text>
-#include &lt;string&gt;
-#include &lt;doctok/sprmids.hxx&gt;
-#include "OOXMLFastHelper.hxx"
-#include "OOXMLfastresources.hxx"
-
-/// @cond GENERATED
-
-namespace writerfilter {
-namespace ooxml {
-using namespace ::std;
-using namespace ::com::sun::star;
-
-      </xsl:text>
-      <xsl:call-template name="fastcontextcreatefromstart"/>
-      <xsl:call-template name="getfastparser"/>
-      <xsl:call-template name="fasttokentoid"/>
-      <xsl:call-template name="sprmkind"/>
-      <xsl:call-template name="dumpattribs"/>
-      <xsl:call-template name="ooxmlidstoxml"/>
-      <xsl:text>
-}}
-/// @endcond GENERATED
-&#xa;</xsl:text></out></xsl:template>
-
-  <xsl:template match="*"/>
-</xsl:stylesheet>
diff --git a/writerfilter/source/ooxml/fastresourcesimpl_ns.xsl b/writerfilter/source/ooxml/fastresourcesimpl_ns.xsl
deleted file mode 100644
index 1b57435ff9de..000000000000
--- a/writerfilter/source/ooxml/fastresourcesimpl_ns.xsl
+++ /dev/null
@@ -1,102 +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: fastresourcesimpl_wml.xsl,v $
- 
-  $Revision: 1.3 $
- 
-  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.
- 
- ************************************************************************/
-
--->
-<xsl:stylesheet 
-    version="1.0" 
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
-    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
-    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
-    xmlns:xlink="http://www.w3.org/1999/xlink" 
-    xmlns:dc="http://purl.org/dc/elements/1.1/" 
-    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
-    xmlns:math="http://www.w3.org/1998/Math/MathML" 
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
-    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
-    xmlns:ooo="http://openoffice.org/2004/office" 
-    xmlns:ooow="http://openoffice.org/2004/writer" 
-    xmlns:oooc="http://openoffice.org/2004/calc" 
-    xmlns:dom="http://www.w3.org/2001/xml-events" 
-    xmlns:xforms="http://www.w3.org/2002/xforms" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  
-    xmlns:rng="http://relaxng.org/ns/structure/1.0"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" 
-    xmlns:UML = 'org.omg.xmi.namespace.UML' xml:space="default">
-  <xsl:output method="text" />
-  <xsl:param name="prefix"/>
-  
-  <xsl:include href="resourcestools.xsl"/>
-
-  <xsl:template match="/">
-    <out>
-      <xsl:variable name="ns" select="substring-before(substring-after($file, 'OOXMLfastresources_'), '.cxx')"/>
-      <xsl:call-template name="licenseheader"/>
-      <xsl:text>
-// namespace: </xsl:text>
-      <xsl:value-of select="$ns"/>
-      <xsl:text>
-#include &lt;iostream&gt;
-#include &lt;doctok/resourceids.hxx&gt;
-#include &lt;ooxml/resourceids.hxx&gt;
-#include &lt;doctok/sprmids.hxx&gt;
-#include "OOXMLfastresources.hxx"
-#include "OOXMLFastTokens.hxx"
-#include "OOXMLFastHelper.hxx"
-#include "OOXMLvalues.hxx"
-#include "Handler.hxx"
-
-/// @cond GENERATED
-
-namespace writerfilter {
-namespace ooxml {
-using namespace ::std;
-
-      </xsl:text>
-      <xsl:call-template name="fastcontextimpls"><xsl:with-param name="ns" select="$ns"/></xsl:call-template>
-      <xsl:text>
-}}
-/// @endcond GENERATED
-&#xa;</xsl:text></out></xsl:template>
-
-  <xsl:template match="*"/>
-</xsl:stylesheet>
diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk
index 5913b3365663..9d7af5394d4e 100644
--- a/writerfilter/source/ooxml/makefile.mk
+++ b/writerfilter/source/ooxml/makefile.mk
@@ -72,9 +72,6 @@ NAMESPACES= \
 
 # --- Files --------------------------------------------------------
 
-SLOFASTNAMESPACES= \
-    $(SLO)$/OOXMLfastresources_{$(NAMESPACES)}.obj
-    
 SLOFACTORIESNAMESPACES= \
     $(SLO)$/OOXMLFactory_{$(NAMESPACES)}.obj
 
@@ -84,8 +81,7 @@ SLOFILES= \
     $(SLO)$/OOXMLFactory_generated.obj \
     $(SLO)$/OOXMLFactory.obj \
     $(SLO)$/OOXMLBinaryObjectReference.obj\
-    $(SLO)$/OOXMLfastresources.obj \
-    $(SLO)$/OOXMLvalues.obj \
+    $(SLO)$/OOXMLFactory_values.obj \
     $(SLO)$/OOXMLPropertySetImpl.obj \
     $(SLO)$/OOXMLParserState.obj \
     $(SLO)$/Handler.obj \
@@ -95,7 +91,6 @@ SLOFILES= \
     $(SLO)$/OOXMLFastContextHandler.obj \
     $(SLO)$/OOXMLFastTokenHandler.obj
 
-
 SHL1TARGET=$(TARGET)
 
 .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
@@ -137,9 +132,6 @@ OOXMLCXXOUTDIR=$(MISC)
 OOXMLHXXOUTDIR=$(INCCOM)/ooxml
 OOXMLHXXOUTDIRCREATED=$(OOXMLHXXOUTDIR)/created
 
-OOXMLFASTRESOURCECXXS=$(OOXMLCXXOUTDIR)$/OOXMLfastresources_{$(NAMESPACES)}.cxx
-OOXMLFASTRESOURCEHXXS=$(OOXMLHXXOUTDIR)$/OOXMLfastresources_{$(NAMESPACES)}.hxx
-
 OOXMLFACTORYCXXS=$(OOXMLCXXOUTDIR)$/OOXMLFactory_{$(NAMESPACES)}.cxx
 OOXMLFACTORYHXXS=$(OOXMLHXXOUTDIR)$/OOXMLFactory_{$(NAMESPACES)}.hxx
 
@@ -149,12 +141,10 @@ OOXMLRESOURCESTOOLSXSL=resourcestools.xsl
 OOXMLRESORUCETOKENSXSL=resourcestokens.xsl
 OOXMLFASTTOKENSXSL=fasttokens.xsl
 OOXMLFASTTOKENSIMPLXSL=fasttokensimpl.xsl
-OOXMLFASTRESOURCESXSL=fastresources.xsl
 OOXMLRESOURCESIMPLXSL=resourcesimpl.xsl
-OOXMLFASTRESOURCESIMPLXSL=fastresourcesimpl.xsl
 OOXMLNAMESPACEIDSXSL=namespaceids.xsl
-OOXMLVALUESXSL=values.xsl
-OOXMLVALUESIMPLXSL=valuesimpl.xsl
+OOXMLFACTORYVALUESXSL=factory_values.xsl
+OOXMLFACTORYVALUESIMPLXSL=factoryimpl_values.xsl
 OOXMLRESOURCEIDSXSL=resourceids.xsl
 OOXMLGPERFFASTTOKENXSL=gperffasttokenhandler.xsl
 
@@ -166,21 +156,17 @@ TOKENXMLTMP=$(OOXMLCXXOUTDIR)$/token.tmp
 OOXMLFACTORYGENERATEDHXX=$(OOXMLHXXOUTDIR)$/OOXMLFactory_generated.hxx
 OOXMLFACTORYGENERATEDCXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_generated.cxx
 OOXMLFASTTOKENSHXX=$(OOXMLHXXOUTDIR)$/OOXMLFastTokens.hxx
-OOXMLFASTRESOURCESHXX=$(OOXMLHXXOUTDIR)$/OOXMLfastresources.hxx
 OOXMLNAMESPACEIDSHXX=$(OOXMLHXXOUTDIR)$/OOXMLnamespaceids.hxx
-OOXMLFASTRESOURCESCXX=$(OOXMLCXXOUTDIR)$/OOXMLfastresources.cxx
-OOXMLVALUESHXX=$(OOXMLCXXOUTDIR)$/OOXMLvalues.hxx
-OOXMLVALUESCXX=$(OOXMLCXXOUTDIR)$/OOXMLvalues.cxx
+OOXMLFACTORYVALUESHXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_values.hxx
+OOXMLFACTORYVALUESCXX=$(OOXMLCXXOUTDIR)$/OOXMLFactory_values.cxx
 GPERFFASTTOKENHXX=$(OOXMLHXXOUTDIR)$/gperffasttoken.hxx
 MODELPROCESSED=$(MISC)$/model_preprocessed.xml
 
 OOXMLGENHEADERS= \
     $(OOXMLFACTORYGENERATEDHXX) \
     $(OOXMLFACTORYHXXS) \
-    $(OOXMLFASTRESOURCESHXX) \
     $(OOXMLFASTTOKENSHXX) \
-    $(OOXMLVALUESHXX) \
-    $(OOXMLFASTRESOURCEHXXS) \
+    $(OOXMLFACTORYVALUESHXX) \
     $(GPERFFASTTOKENHXX) \
     $(OOXMLRESOURCEIDSHXX) \
     $(OOXMLNAMESPACEIDSHXX)
@@ -190,8 +176,7 @@ GENERATEDFILES= \
     $(MODELPROCESSED) \
     $(OOXMLFACTORYGENERATEDCXX) \
     $(OOXMLFACTORYCXXS) \
-    $(OOXMLFASTRESOURCECXXS) \
-    $(OOXMLVALUESCXX) \
+    $(OOXMLFACTORYVALUESCXX) \
     $(TOKENXMLTMP) \
     $(TOKENXML)
 
@@ -213,13 +198,6 @@ $(OOXMLGENHEADERS): $(OOXMLHXXOUTDIRCREATED)
 $(OOXMLFASTTOKENSHXX): $(OOXMLFASTTOKENSXSL) $(TOKENXML)
     $(XSLTPROC) $(OOXMLFASTTOKENSXSL) $(TOKENXML) > $@
 
-$(OOXMLFASTRESOURCESHXX): $(OOXMLFASTRESOURCESXSL) $(MODELPROCESSED)
-    $(XSLTPROC) $(OOXMLFASTRESOURCESXSL) $(MODELPROCESSED) > $@
-
-$(OOXMLFASTRESOURCESCXX): $(OOXMLFASTRESOURCEHXXS) \
-    $(OOXMLFASTRESOURCESIMPLXSL) $(MODELPROCESSED) 
-    $(XSLTPROC) $(OOXMLFASTRESOURCESIMPLXSL) $(MODELPROCESSED) > $@
-
 $(OOXMLFACTORYGENERATEDHXX): factoryinc.xsl
     $(XSLTPROC) $< $(MODELPROCESSED) > $@
 
@@ -230,32 +208,21 @@ $(OOXMLFACTORYGENERATEDCXX): $(MODELPROCESSED)
 
 $(OOXMLFACTORYGENERATEDHXX): $(MODELPROCESSED)
 
-$(OOXMLFASTRESOURCECXXS): $(MODELPROCESSED)
-
-$(OOXMLFASTRESOURCEHXXS): $(MODELPROCESSED)
-
 $(OOXMLFACTORYCXXS): $(MODELPROCESSED)
 
 $(OOXMLFACTORYHXXS): $(MODELPROCESSED)
 
-$(OOXMLCXXOUTDIR)$/OOXMLfastresources%.cxx: fastresourcesimpl_ns.xsl
-    $(XSLTPROC) --stringparam file $@ $< $(MODELPROCESSED) > $@
-
-$(OOXMLHXXOUTDIR)$/OOXMLfastresources%.hxx: fastresources_ns.xsl
-    $(XSLTPROC) --stringparam file $@ $< $(MODELPROCESSED) > $@
-
 $(OOXMLCXXOUTDIR)$/OOXMLFactory%.cxx: factoryimpl_ns.xsl
     $(XSLTPROC) --stringparam file $@ $< $(MODELPROCESSED) > $@
 
 $(OOXMLHXXOUTDIR)$/OOXMLFactory%.hxx: factory_ns.xsl
     $(XSLTPROC) --stringparam file $@ $< $(MODELPROCESSED) > $@
 
-$(OOXMLVALUESHXX): $(OOXMLVALUESXSL) $(MODELPROCESSED)
-    $(XSLTPROC) $(OOXMLVALUESXSL) $(MODELPROCESSED) > $@
+$(OOXMLFACTORYVALUESHXX): $(OOXMLFACTORYVALUESXSL) $(MODELPROCESSED)
+    $(XSLTPROC) $(OOXMLFACTORYVALUESXSL) $(MODELPROCESSED) > $@
 
-$(OOXMLVALUESCXX): $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) \
-    $(OOXMLFASTRESOURCESHXX)
-    $(XSLTPROC) $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) > $@
+$(OOXMLFACTORYVALUESCXX): $(OOXMLFACTORYVALUESIMPLXSL) $(MODELPROCESSED)
+    $(XSLTPROC) $(OOXMLFACTORYVALUESIMPLXSL) $(MODELPROCESSED) > $@
 
 $(OOXMLRESOURCEIDSHXX):  $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCEIDSXSL) \
     $(MODELPROCESSED)
@@ -268,22 +235,16 @@ $(OOXMLNAMESPACEIDSHXX):  $(OOXMLHXXOUTDIRCREATED) $(OOXMLNAMESPACEIDSXSL) \
 $(GPERFFASTTOKENHXX): $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED)
     $(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
 
-$(SLOFASTNAMESPACES): $(OOXMLFASTRESOURCESCXX) $(OOXMLGENHEADERS)
-
 $(SLOFACTORIESNAMESPACES): $(OOXMLFACTORYSCXXS) $(OOXMLGENHEADERS)
 
 $(GENERATEDFILES): $(OOXMLRESOURCESTOOLSXSL)
 
 $(SLOFILES): $(OOXMLGENHEADERS)
 
-$(SLO)/OOXMLfastresources.obj: $(OOXMLFASTRESOURCESCXX) $(OOXMLGENHEADERS)
-
-$(SLO)/OOXMLvalues.obj: $(OOXMLVALUESCXX) $(OOXMLVALUESHXX)
+$(SLO)/OOXMLFactory_values.obj: $(OOXMLFACTORYVALUESCXX) $(OOXMLFACTORYVALUESHXX)
 
 $(SLO)$/OOXMLFactory_generated.obj: $(OOXMLFACTORYGENERATEDCXX) $(OOXMLGENHEADERS)
 
-$(SLOFASTNAMESPACES): OOXMLFastHelper.hxx
-
 .PHONY: genclean genmake genheaders
 
 genclean:
@@ -291,4 +252,4 @@ genclean:
 
 genmake: $(GENERATEDFILES)
 
-genheaders: $(OOXMLFASTRESOURCEHXXS)
+genheaders: $(GENHEADERS)