summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-12-13 20:45:25 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-12-13 20:45:25 +0100
commitf7a87bf8377ae85344213bd3f3710e73d6ee7890 (patch)
tree5088e69cdc0be222a9c07ddb346f6e868d1614aa
parent7012e5fc7509f2c61dcde736103edc5087a62909 (diff)
writerfilter: only dmapper needs DomainMapper.hxx
Change-Id: I9508938754cf353ecc210eb13d7063ac7ef437bf
-rw-r--r--writerfilter/source/dmapper/DomainMapper.hxx (renamed from writerfilter/inc/dmapper/DomainMapper.hxx)4
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx2
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx2
-rw-r--r--writerfilter/source/dmapper/NumberingManager.hxx2
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx2
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx1
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.hxx2
-rw-r--r--writerfilter/source/dmapper/TablePropertiesHandler.cxx2
-rw-r--r--writerfilter/source/dmapper/TblStylePrHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/domainmapperfactory.cxx2
11 files changed, 11 insertions, 12 deletions
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index 6564e32d897a..1f200383d264 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_WRITERFILTER_INC_DMAPPER_DOMAINMAPPER_HXX
-#define INCLUDED_WRITERFILTER_INC_DMAPPER_DOMAINMAPPER_HXX
+#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPER_HXX
+#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPER_HXX
#include <dmapper/DomainMapperFactory.hxx>
#include <resourcemodel/LoggedResources.hxx>
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 4f11192d29d7..99340ea711de 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -33,7 +33,7 @@
#include <o3tl/numeric.hxx>
#include <ooxml/resourceids.hxx>
#include <dmapperLoggers.hxx>
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
#include <rtl/math.hxx>
namespace writerfilter {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 11e58cd9ff1f..535772bc17d6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -35,7 +35,7 @@
#include <ooxml/resourceids.hxx>
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
#include "DomainMapperTableManager.hxx"
#include "PropertyMap.hxx"
#include "FontTable.hxx"
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index ae3a5a935cda..bcd78f4c4754 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -51,7 +51,7 @@
#include <oox/drawingml/drawingmltypes.hxx>
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
#include <dmapper/GraphicZOrderHelper.hxx>
#include <ooxml/resourceids.hxx>
#include <resourcemodel/ResourceModelHelper.hxx>
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 5a180cf2e22d..1c25da66d4cd 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -22,7 +22,7 @@
#include "PropertyMap.hxx"
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
#include <resourcemodel/LoggedResources.hxx>
#include <editeng/numitem.hxx>
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index e2c94be2ca6c..b04c927a1c25 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <OLEHandler.hxx>
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
#include <PropertyMap.hxx>
#include "GraphicHelpers.hxx"
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index f9997126edb2..89e00d9a8476 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -18,7 +18,6 @@
*/
#include <resourcemodel/ResourceModelHelper.hxx>
#include <StyleSheetTable.hxx>
-#include <dmapper/DomainMapper.hxx>
#include <NumberingManager.hxx>
#include <ConversionHelper.hxx>
#include <TblStylePrHandler.hxx>
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index ada430278ac5..5e2ba514bb7f 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -21,7 +21,7 @@
#include "TblStylePrHandler.hxx"
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/beans/PropertyValues.hpp>
#include "PropertyMap.hxx"
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index c9516120f696..4bc10ec0a908 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/text/VertOrientation.hpp>
#include <dmapperLoggers.hxx>
#include <oox/token/tokens.hxx>
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
using namespace com::sun::star;
using namespace oox;
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 3191efa19d29..8ec2dcc76fae 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -22,7 +22,7 @@
#include "TablePropertiesHandler.hxx"
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
#include <resourcemodel/LoggedResources.hxx>
#include <boost/shared_ptr.hpp>
#include <comphelper/sequenceasvector.hxx>
diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/writerfilter/source/dmapper/domainmapperfactory.cxx
index e3965348ac19..bf9810fc0480 100644
--- a/writerfilter/source/dmapper/domainmapperfactory.cxx
+++ b/writerfilter/source/dmapper/domainmapperfactory.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
namespace writerfilter
{