writerfilter: util.hxx is used only inside dmapper

Change-Id: Ia3736c32c460b466649f10f4790c30d0d25f8c5e

9 files changed, 21 insertions, 26 deletions

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index df2d1e107047..8377e191783e 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -108,6 +108,7 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
     writerfilter/source/dmapper/TblStylePrHandler \
     writerfilter/source/dmapper/ThemeTable \
     writerfilter/source/dmapper/WrapPolygonHandler \
+    writerfilter/source/dmapper/util \
     writerfilter/source/filter/ImportFilter \
     writerfilter/source/filter/RtfFilter \
     writerfilter/source/filter/WriterFilter \
@@ -125,7 +126,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
     writerfilter/source/resourcemodel/ResourceModelHelper \
     writerfilter/source/resourcemodel/TagLogger \
     writerfilter/source/resourcemodel/qnametostrcore \
-    writerfilter/source/resourcemodel/util \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index c1487b455fb9..035b0761dc06 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -35,6 +35,7 @@
 #include <dmapperLoggers.hxx>
 #include <TablePositionHandler.hxx>
 #include <ConversionHelper.hxx>
+#include <util.hxx>
 #include <osl/diagnose.h>
 
 #ifdef DEBUG_WRITERFILTER
@@ -1174,7 +1175,7 @@ void DomainMapperTableHandler::startCell(const Handle_t & start,
 #ifdef DEBUG_WRITERFILTER
     dmapper_logger->startElement("table.cell");
     dmapper_logger->startElement("table.cell.start");
-    dmapper_logger->chars(toString(start));
+    dmapper_logger->chars(XTextRangeToString(start));
     dmapper_logger->endElement();
     if (pProps.get())
         pProps->printProperties();
@@ -1191,7 +1192,7 @@ void DomainMapperTableHandler::endCell(const Handle_t & end)
 {
 #ifdef DEBUG_WRITERFILTER
     dmapper_logger->startElement("table.cell.end");
-    dmapper_logger->chars(toString(end));
+    dmapper_logger->chars(XTextRangeToString(end));
     dmapper_logger->endElement();
     dmapper_logger->endElement();
 #endif
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1a1ccdccc55a..ac7af0d2fc4d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -70,7 +70,6 @@
 
 #ifdef DEBUG_WRITERFILTER
 #include <resourcemodel/QNameToString.hxx>
-#include <resourcemodel/util.hxx>
 #include <dmapperLoggers.hxx>
 #endif
 #include <oox/token/tokens.hxx>
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index dff29f8212d4..920a07d7c2fd 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <TableManager.hxx>
+#include <util.hxx>
 
 namespace writerfilter
 {
@@ -32,7 +33,7 @@ void TableManager::openCell(const css::uno::Reference<css::text::XTextRange>& rH
 {
 #ifdef DEBUG_WRITERFILTER
     mpTableLogger->startElement("tablemanager.openCell");
-    mpTableLogger->chars(toString(rHandle));
+    mpTableLogger->chars(XTextRangeToString(rHandle));
     mpTableLogger->endElement();
 #endif
 
@@ -205,7 +206,7 @@ void TableManager::closeCell(const css::uno::Reference<css::text::XTextRange>& r
 {
 #ifdef DEBUG_WRITERFILTER
     mpTableLogger->startElement("tablemanager.closeCell");
-    mpTableLogger->chars(toString(rHandle));
+    mpTableLogger->chars(XTextRangeToString(rHandle));
     mpTableLogger->endElement();
 #endif
 
@@ -425,7 +426,7 @@ void TableManager::handle(const css::uno::Reference<css::text::XTextRange>& rHan
     if (mpTableLogger)
     {
         mpTableLogger->startElement("tablemanager.handle");
-        mpTableLogger->chars(toString(rHandle));
+        mpTableLogger->chars(XTextRangeToString(rHandle));
         mpTableLogger->endElement();
     }
 #endif
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx
index 59f2d7bc8fbc..a01a3a347f94 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -26,7 +26,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include <stack>
-#include <resourcemodel/util.hxx>
 #include <resourcemodel/TagLogger.hxx>
 
 #include <rtl/strbuf.hxx>
diff --git a/writerfilter/source/resourcemodel/util.cxx b/writerfilter/source/dmapper/util.cxx
index 5c1a1b1a138e..f0df3987ada6 100644
--- a/writerfilter/source/resourcemodel/util.cxx
+++ b/writerfilter/source/dmapper/util.cxx
@@ -20,23 +20,16 @@
 #include <stdlib.h>
 #include <fstream>
 #include <string>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/BitmapMode.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/HomogenMatrix3.hpp>
-#include <com/sun/star/text/TextContentAnchorType.hpp>
-#include <resourcemodel/WW8ResourceModel.hxx>
-#include <resourcemodel/TagLogger.hxx>
-#include <resourcemodel/util.hxx>
+#include <util.hxx>
 
 namespace writerfilter
 {
+namespace dmapper
+{
 using namespace com::sun::star;
 using namespace std;
 
-string toString(uno::Reference< text::XTextRange > textRange)
+string XTextRangeToString(uno::Reference< text::XTextRange > textRange)
 {
     string result;
 
@@ -60,4 +53,6 @@ string toString(uno::Reference< text::XTextRange > textRange)
 
 }
 
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/resourcemodel/util.hxx b/writerfilter/source/dmapper/util.hxx
index 18e424ff1abf..29ef0de5cb71 100644
--- a/writerfilter/inc/resourcemodel/util.hxx
+++ b/writerfilter/source/dmapper/util.hxx
@@ -17,18 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
-#define INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
+#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_UTIL_HXX
+#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_UTIL_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <string>
 
 namespace writerfilter
 {
-    std::string toString(css::uno::Reference< css::text::XTextRange > textRange);
+namespace dmapper
+{
+    std::string XTextRangeToString(css::uno::Reference< css::text::XTextRange > textRange);
+}
 }
 
-#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
+#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_UTIL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 6f03fdc56b8f..30caf267e344 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/xml/sax/FastShapeContextHandler.hpp>
 #include <resourcemodel/QNameToString.hxx>
-#include <resourcemodel/util.hxx>
 #include <ooxml/resourceids.hxx>
 #include <oox/token/namespaces.hxx>
 #include <dmapper/DomainMapper.hxx>
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index 8008268be2a7..d10610cb519c 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -20,7 +20,6 @@
 #include <libxml/xmlstring.h>
 #include <string.h>
 #include <resourcemodel/TagLogger.hxx>
-#include <resourcemodel/util.hxx>
 #include <resourcemodel/QNameToString.hxx>
 #include <boost/unordered_map.hpp>