writerfilter: fold single remaining header of resourcemodel into dmapper

Change-Id: I54cc8ebda18c8ca7071c39210687f28adbc4790a

21 files changed, 28 insertions, 30 deletions

diff --git a/writerfilter/README b/writerfilter/README
index 0d492e4070cd..f45f9e85e720 100644
--- a/writerfilter/README
+++ b/writerfilter/README
@@ -1,21 +1,20 @@
 The writerfilter module contains import filters for Writer, using its UNO API.
 
-Import filter for docx, doc and rtf.
+Import filter for docx and rtf.
 
 == Module contents ==
- * documentation
- * inc: global headers (can be included by other modules)
- * qa: unittests and subsequenttests
+ * documentation: RNG schema for the OOXML tokenizer, etc.
+ * inc: module-global headers (can be included by any files under source)
+ * qa: cppunit tests
  * source: the filters themselves
  * util: UNO passive registration config
 
 == Source contents ==
  * dmapper: the domain mapper, hiding UNO from the tokenizers, used by DOCX and RTF import
    * The incoming traffic of dmapper can be dumped into an XML file in /tmp in
-     debug builds, start soffice with the
-     `SW_DEBUG_WRITERFILTER=1` environment variable if you want that.
+     debug builds, start soffice with the `SW_DEBUG_WRITERFILTER=1`
+     environment variable if you want that.
  * filter: the UNO filter service implementations, invoked by UNO and calling
    the dmapper + one of the tokenizers
  * ooxml: the docx tokenizer
- * resourcemodel
  * rtftok: the rtf tokenizer
diff --git a/writerfilter/inc/dmapper/DomainMapperFactory.hxx b/writerfilter/inc/dmapper/DomainMapperFactory.hxx
index 05cb9b58c7fa..39a9aa7c2c46 100644
--- a/writerfilter/inc/dmapper/DomainMapperFactory.hxx
+++ b/writerfilter/inc/dmapper/DomainMapperFactory.hxx
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_WRITERFILTER_INC_DMAPPER_DOMAINMAPPERFACTORY_HXX
 #define INCLUDED_WRITERFILTER_INC_DMAPPER_DOMAINMAPPERFACTORY_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx
index b6ba40e282eb..0e0775792b92 100644
--- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_WW8RESOURCEMODEL_HXX
-#define INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_WW8RESOURCEMODEL_HXX
+#ifndef INCLUDED_WRITERFILTER_INC_DMAPPER_RESOURCEMODEL_HXX
+#define INCLUDED_WRITERFILTER_INC_DMAPPER_RESOURCEMODEL_HXX
 
 #include <string>
 #include <memory>
@@ -27,7 +27,7 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/uno/Any.hxx>
 /**
-   @file WW8ResourceModel.hxx
+   @file resourcemodel.hxx
 
    The classes in this file define the interfaces for the resource
    model of the DocTokenizer:
@@ -409,6 +409,6 @@ typedef sal_Int32 Token_t;
 
 }
 
-#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_WW8RESOURCEMODEL_HXX
+#endif // INCLUDED_WRITERFILTER_INC_DMAPPER_RESOURCEMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 3b778baec658..8882f42d9e43 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/xml/sax/XParser.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
diff --git a/writerfilter/inc/ooxml/QNameToString.hxx b/writerfilter/inc/ooxml/QNameToString.hxx
index 89ddcf786b91..88abc59502a1 100644
--- a/writerfilter/inc/ooxml/QNameToString.hxx
+++ b/writerfilter/inc/ooxml/QNameToString.hxx
@@ -23,7 +23,7 @@
 #include <map>
 #include <string>
 #include <iostream>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 namespace writerfilter
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx b/writerfilter/inc/rtftok/RTFDocument.hxx
index 7f5391cdf080..8b6878030647 100644
--- a/writerfilter/inc/rtftok/RTFDocument.hxx
+++ b/writerfilter/inc/rtftok/RTFDocument.hxx
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_WRITERFILTER_INC_RTFTOK_RTFDOCUMENT_HXX
 #define INCLUDED_WRITERFILTER_INC_RTFTOK_RTFDOCUMENT_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 99340ea711de..3399707d52eb 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -18,7 +18,6 @@
  */
 #include <boost/optional.hpp>
 #include <DomainMapperTableManager.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
 #include <BorderHandler.hxx>
 #include <CellColorHandler.hxx>
 #include <CellMarginHandler.hxx>
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx
index 602fea41254e..4b9c3872b45e 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LOGGEDRESOURCES_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LOGGEDRESOURCES_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 #include "TagLogger.hxx"
 
 
diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index 631a7558144b..9151494040fe 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEDATA_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEDATA_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx
index 018b7d99cba9..07803e01a52c 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 
 #include <ooxml/resourceids.hxx>
 
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index e9d5c4ea43e8..ff3d1bd95a17 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -23,7 +23,7 @@
 #include "PropertyMap.hxx"
 
 #include <TableManager.hxx>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/writerfilter/source/dmapper/TagLogger.hxx b/writerfilter/source/dmapper/TagLogger.hxx
index e7043106c5b4..228c690d00e2 100644
--- a/writerfilter/source/dmapper/TagLogger.hxx
+++ b/writerfilter/source/dmapper/TagLogger.hxx
@@ -22,7 +22,7 @@
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 #include <string>
 #include <boost/shared_ptr.hpp>
 #include <libxml/xmlwriter.h>
diff --git a/writerfilter/source/dmapper/util.hxx b/writerfilter/source/dmapper/util.hxx
index 2f1a248d6fb3..a57e6eb051b1 100644
--- a/writerfilter/source/dmapper/util.hxx
+++ b/writerfilter/source/dmapper/util.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/text/XTextRange.hpp>
 #include <string>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 
 namespace writerfilter
 {
diff --git a/writerfilter/source/ooxml/Handler.hxx b/writerfilter/source/ooxml/Handler.hxx
index ba92f640ddf0..642de8c40a54 100644
--- a/writerfilter/source/ooxml/Handler.hxx
+++ b/writerfilter/source/ooxml/Handler.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_HANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_OOXML_HANDLER_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 #include "OOXMLFastContextHandler.hxx"
 
 namespace writerfilter {
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
index 929a27faa8c7..d259ead053f5 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
+++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLBINARYOBJECTREFERENCE_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLBINARYOBJECTREFERENCE_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 #include <ooxml/OOXMLDocument.hxx>
 
 namespace writerfilter {
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index c90f7292972f..e369326459c7 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -22,7 +22,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 
 #include <oox/token/tokens.hxx>
 
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index f446d43fa8e6..e8263acaa413 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 #include <ooxml/OOXMLDocument.hxx>
 #include "OOXMLParserState.hxx"
 
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 214781fb7eac..25d79ebcdd2d 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLPROPERTYSET_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLPROPERTYSET_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 
 namespace writerfilter {
 namespace ooxml
diff --git a/writerfilter/source/ooxml/resourceids.py b/writerfilter/source/ooxml/resourceids.py
index c612e77efb2b..087f00c83f86 100644
--- a/writerfilter/source/ooxml/resourceids.py
+++ b/writerfilter/source/ooxml/resourceids.py
@@ -29,7 +29,7 @@ class ContentHandler(xml.sax.handler.ContentHandler):
 #ifndef INCLUDED_OOXML_RESOURCEIDS_HXX
 #define INCLUDED_OOXML_RESOURCEIDS_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 
 namespace writerfilter {
 
diff --git a/writerfilter/source/rtftok/rtfreferencetable.hxx b/writerfilter/source/rtftok/rtfreferencetable.hxx
index 91c3e7bb27d3..f392ed93f6d8 100644
--- a/writerfilter/source/rtftok/rtfreferencetable.hxx
+++ b/writerfilter/source/rtftok/rtfreferencetable.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFREFERENCETABLE_HXX
 
 #include <map>
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 
 namespace writerfilter
 {
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index 4af08dbf9491..03c7823727eb 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFVALUE_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFVALUE_HXX
 
-#include <resourcemodel/WW8ResourceModel.hxx>
+#include <dmapper/resourcemodel.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>