summaryrefslogtreecommitdiff
path: root/writerfilter/inc
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-12-22 12:38:57 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-12-22 19:33:56 +0100
commitfcec34ffcc93f98be005b06c223e25c9c4e77cde (patch)
treeee32458100d074e878786642b0f07e7df3b56fd4 /writerfilter/inc
parent6023347ab02a059011e9d4dde578e5b2a0b2903b (diff)
writerfilter: fold single remaining header of resourcemodel into dmapper
Change-Id: I54cc8ebda18c8ca7071c39210687f28adbc4790a
Diffstat (limited to 'writerfilter/inc')
-rw-r--r--writerfilter/inc/dmapper/DomainMapperFactory.hxx2
-rw-r--r--writerfilter/inc/dmapper/resourcemodel.hxx (renamed from writerfilter/inc/resourcemodel/WW8ResourceModel.hxx)8
-rw-r--r--writerfilter/inc/ooxml/OOXMLDocument.hxx2
-rw-r--r--writerfilter/inc/ooxml/QNameToString.hxx2
-rw-r--r--writerfilter/inc/rtftok/RTFDocument.hxx2
5 files changed, 8 insertions, 8 deletions
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>