[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source

[Miklos Vajna]

 writerfilter/inc/resourcemodel/TableData.hxx |  423 --------------------------
 writerfilter/source/dmapper/TableData.hxx    |  426 +++++++++++++++++++++++++++
 writerfilter/source/dmapper/TableManager.hxx |    3 
 3 files changed, 427 insertions(+), 425 deletions(-)

New commits:
commit 1ef57521af0a53d03c68321817f9dadf7f4dd730
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Dec 3 21:27:46 2014 +0100

    writerfilter: only dmapper needs TableData
    
    Change-Id: I4c2ead05d845eebe101d34ed8fe9284509beb752

diff --git a/writerfilter/inc/resourcemodel/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
similarity index 97%
rename from writerfilter/inc/resourcemodel/TableData.hxx
rename to writerfilter/source/dmapper/TableData.hxx
index 53299b8..7f8b406 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 2559d54..b7fed59 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
 {