diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-03 21:27:46 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-03 21:37:12 +0100 |
| commit | 1ef57521af0a53d03c68321817f9dadf7f4dd730 (patch) | |
| tree | 6c0dac3557209841f8bb9035778b317bb250c0ce /writerfilter | |
| parent | 179810cdf254177197a3108e970d9555468cd265 (diff) | |
writerfilter: only dmapper needs TableData
Change-Id: I4c2ead05d845eebe101d34ed8fe9284509beb752
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/TableData.hxx (renamed from writerfilter/inc/resourcemodel/TableData.hxx) | 9 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TableManager.hxx | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/writerfilter/inc/resourcemodel/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx index 53299b85420e..7f8b406d3630 100644 --- a/writerfilter/inc/resourcemodel/TableData.hxx +++ b/writerfilter/source/dmapper/TableData.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_TABLEDATA_HXX -#define INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_TABLEDATA_HXX +#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_RESOURCEMODEL_TABLEDATA_HXX +#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_RESOURCEMODEL_TABLEDATA_HXX #include <resourcemodel/WW8ResourceModel.hxx> @@ -27,6 +27,8 @@ namespace writerfilter { +namespace dmapper +{ template <typename T, typename PropertiesPointer> /** @@ -417,7 +419,8 @@ public: }; } +} -#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_TABLEDATA_HXX +#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_RESOURCEMODEL_TABLEDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 2559d549e34e..b7fed59f03d6 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX -#include <resourcemodel/TableData.hxx> - #include <resourcemodel/WW8ResourceModel.hxx> #include <ooxml/resourceids.hxx> @@ -33,6 +31,7 @@ #include <rtl/strbuf.hxx> #include <PropertyMap.hxx> +#include <TableData.hxx> namespace writerfilter { |