diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-29 13:19:19 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-30 11:27:59 +0100 |
| commit | ccfd64827aa557813efdcdfbbb93f3172d3a2493 (patch) | |
| tree | 8c32900d2020095199959aaac1a16bc77cd98464 /writerfilter | |
| parent | db92adda5b4f7bd7ca1c3bbb87802752c6867d71 (diff) | |
writerfilter: only dmapper needs TableManager.hxx
Change-Id: I3354f82a3dd0a598b5405ab32c5d1b0d370829c3
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/CppunitTest_writerfilter_misc.mk | 1 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TableManager.hxx (renamed from writerfilter/inc/resourcemodel/TableManager.hxx) | 8 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TablePropertiesHandler.hxx | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_misc.mk b/writerfilter/CppunitTest_writerfilter_misc.mk index 3f4fd80809a5..f563c7a58977 100644 --- a/writerfilter/CppunitTest_writerfilter_misc.mk +++ b/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)) diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index f1fe80479a84..bd716741515f 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/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> diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 65aecc7a11af..599c43213883 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/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> diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index c13303c31859..6bac58d3c862 100644 --- a/writerfilter/inc/resourcemodel/TableManager.hxx +++ b/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> diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx index ed41c643bd46..467e9f1f9d90 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx +++ b/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> |