writerfilter: only dmapper needs TableManager.hxx

Change-Id: I3354f82a3dd0a598b5405ab32c5d1b0d370829c3

writerfilter/CppunitTest_writerfilter_misc.mk

@@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_set_include,writerfilter_misc,\
     $$(INCLUDE) \
     -I$(SRCDIR)/writerfilter/inc \
     -I$(SRCDIR)/writerfilter/source \
+    -I$(SRCDIR)/writerfilter/source/dmapper \
 ))
 
 $(eval $(call gb_CppunitTest_use_external,writerfilter_misc,boost_headers))

writerfilter/source/dmapper/DomainMapperTableHandler.hxx

@@ -19,7 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPERTABLEHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPERTABLEHANDLER_HXX
 
-#include <resourcemodel/TableManager.hxx>
+#include <TableManager.hxx>
 #include <PropertyMap.hxx>
 #include <comphelper/sequenceasvector.hxx>
 

writerfilter/source/dmapper/DomainMapperTableManager.hxx

@@ -22,7 +22,7 @@
 #include "TablePropertiesHandler.hxx"
 #include "TablePositionHandler.hxx"
 
-#include <resourcemodel/TableManager.hxx>
+#include <TableManager.hxx>
 #include "PropertyMap.hxx"
 #include "StyleSheetTable.hxx"
 #include <com/sun/star/text/XTextRange.hpp>

writerfilter/inc/resourcemodel/TableManager.hxx → writerfilter/source/dmapper/TableManager.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_TABLEMANAGER_HXX
-#define INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_TABLEMANAGER_HXX
+#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX
+#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX
 
 #include <resourcemodel/TableData.hxx>
 
@@ -28,8 +28,8 @@
 
 #include <boost/shared_ptr.hpp>
 #include <stack>
-#include "util.hxx"
-#include "TagLogger.hxx"
+#include <resourcemodel/util.hxx>
+#include <resourcemodel/TagLogger.hxx>
 
 #include <rtl/strbuf.hxx>
 

writerfilter/source/dmapper/TablePropertiesHandler.hxx

@@ -22,7 +22,7 @@
 
 #include "PropertyMap.hxx"
 
-#include <resourcemodel/TableManager.hxx>
+#include <TableManager.hxx>
 #include <resourcemodel/WW8ResourceModel.hxx>
 
 #include <boost/shared_ptr.hpp>