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

Miklos Vajna vmiklos at collabora.co.uk
Sat Dec 13 11:46:14 PST 2014 

 writerfilter/Library_writerfilter.mk                     |    2 
 writerfilter/inc/dmapper/DomainMapper.hxx                |  175 -------
 writerfilter/inc/dmapper/GraphicZOrderHelper.hxx         |   34 +
 writerfilter/inc/resourcemodel/LoggedResources.hxx       |  131 -----
 writerfilter/source/dmapper/BorderHandler.hxx            |    2 
 writerfilter/source/dmapper/CellColorHandler.hxx         |    2 
 writerfilter/source/dmapper/CellMarginHandler.hxx        |    2 
 writerfilter/source/dmapper/DomainMapper.cxx             |    1 
 writerfilter/source/dmapper/DomainMapper.hxx             |  175 +++++++
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |    2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx        |    1 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx        |    2 
 writerfilter/source/dmapper/FFDataHandler.hxx            |    2 
 writerfilter/source/dmapper/FontTable.hxx                |    2 
 writerfilter/source/dmapper/GraphicHelpers.cxx           |    1 
 writerfilter/source/dmapper/GraphicHelpers.hxx           |   13 
 writerfilter/source/dmapper/GraphicImport.cxx            |    3 
 writerfilter/source/dmapper/GraphicImport.hxx            |    2 
 writerfilter/source/dmapper/LatentStyleHandler.hxx       |    2 
 writerfilter/source/dmapper/LoggedResources.cxx          |  354 +++++++++++++++
 writerfilter/source/dmapper/LoggedResources.hxx          |  131 +++++
 writerfilter/source/dmapper/MeasureHandler.hxx           |    2 
 writerfilter/source/dmapper/NumberingManager.hxx         |    4 
 writerfilter/source/dmapper/OLEHandler.cxx               |    2 
 writerfilter/source/dmapper/OLEHandler.hxx               |    2 
 writerfilter/source/dmapper/PageBordersHandler.hxx       |    2 
 writerfilter/source/dmapper/SectionColumnHandler.hxx     |    2 
 writerfilter/source/dmapper/SettingsTable.hxx            |    2 
 writerfilter/source/dmapper/StyleSheetTable.cxx          |    1 
 writerfilter/source/dmapper/StyleSheetTable.hxx          |    4 
 writerfilter/source/dmapper/TDefTableHandler.hxx         |    2 
 writerfilter/source/dmapper/TablePositionHandler.hxx     |    2 
 writerfilter/source/dmapper/TablePropertiesHandler.cxx   |    2 
 writerfilter/source/dmapper/TblStylePrHandler.hxx        |    4 
 writerfilter/source/dmapper/TextEffectsHandler.hxx       |    2 
 writerfilter/source/dmapper/ThemeTable.hxx               |    2 
 writerfilter/source/dmapper/TrackChangesHandler.hxx      |    2 
 writerfilter/source/dmapper/WrapPolygonHandler.hxx       |    2 
 writerfilter/source/dmapper/domainmapperfactory.cxx      |    2 
 writerfilter/source/filter/ImportFilter.cxx              |    6 
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx    |    1 
 writerfilter/source/resourcemodel/LoggedResources.cxx    |  354 ---------------
 writerfilter/source/rtftok/rtfsdrimport.cxx              |    9 
 writerfilter/source/rtftok/rtfsdrimport.hxx              |    2 
 44 files changed, 737 insertions(+), 715 deletions(-)

New commits:
commit 2ffeaecdf0bbef478408fb6753ec6cf9ea043b16
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Dec 13 20:45:30 2014 +0100

    writerfilter: only dmapper needs LoggedResources
    
    Change-Id: Ic8c691c4185ec8b808e75885f9354c35d68be58c

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 2c6d01e..3516777 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
     writerfilter/source/dmapper/GraphicHelpers \
     writerfilter/source/dmapper/GraphicImport \
     writerfilter/source/dmapper/LatentStyleHandler \
+    writerfilter/source/dmapper/LoggedResources \
     writerfilter/source/dmapper/MeasureHandler \
     writerfilter/source/dmapper/TrackChangesHandler \
     writerfilter/source/dmapper/ModelEventListener \
@@ -124,7 +125,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
     writerfilter/source/ooxml/OOXMLPropertySetImpl \
     writerfilter/source/ooxml/OOXMLStreamImpl \
     writerfilter/source/ooxml/qnametostrcore \
-    writerfilter/source/resourcemodel/LoggedResources \
     writerfilter/source/resourcemodel/ResourceModelHelper \
     writerfilter/source/resourcemodel/TagLogger \
 ))
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 4f2ce9c..1318901 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_BORDERHANDLER_HXX
 
 #include <vector>
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index 041272d..a465428 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLCOLORHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLCOLORHANDLER_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <vector>
 
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx
index 6a59b84..fab55d1 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLMARGINHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_CELLMARGINHANDLER_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index 1f20038..b1b0ba7 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPER_HXX
 
 #include <dmapper/DomainMapperFactory.hxx>
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/style/TabAlign.hpp>
 
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/writerfilter/source/dmapper/FFDataHandler.hxx
index d01cab5..cea6587 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FFDATAHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FFDATAHANDLER_HXX
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <rtl/ustring.hxx>
 #include <vector>
 namespace writerfilter {
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 8a05dce..9b691ab 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_FONTTABLE_HXX
 
 #include <boost/shared_ptr.hpp>
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index f77efc0..545dd95 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_GRAPHICHELPERS_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_GRAPHICHELPERS_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index 75dad4f..3552d26 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -22,7 +22,7 @@
 #include <queue>
 #include <boost/scoped_ptr.hpp>
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace uno
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index b7c4128..07f3017 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LATENTSTYLEHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LATENTSTYLEHANDLER_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx
similarity index 99%
rename from writerfilter/source/resourcemodel/LoggedResources.cxx
rename to writerfilter/source/dmapper/LoggedResources.cxx
index 6aa834b..4d8051e 100644
--- a/writerfilter/source/resourcemodel/LoggedResources.cxx
+++ b/writerfilter/source/dmapper/LoggedResources.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <rtl/ustrbuf.hxx>
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <ooxml/QNameToString.hxx>
 
 using namespace ::com::sun::star;
diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx
similarity index 94%
rename from writerfilter/inc/resourcemodel/LoggedResources.hxx
rename to writerfilter/source/dmapper/LoggedResources.hxx
index ccb3363..5147511 100644
--- a/writerfilter/inc/resourcemodel/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_LOGGEDRESOURCES_HXX
-#define INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_LOGGEDRESOURCES_HXX
+#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LOGGEDRESOURCES_HXX
+#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LOGGEDRESOURCES_HXX
 
-#include "WW8ResourceModel.hxx"
-#include "TagLogger.hxx"
+#include <resourcemodel/WW8ResourceModel.hxx>
+#include <resourcemodel/TagLogger.hxx>
 
 
 namespace writerfilter
@@ -126,6 +126,6 @@ protected:
 };
 
 }
-#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_LOGGEDRESOURCES_HXX
+#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LOGGEDRESOURCES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index 8a52e70..47b7e5f 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_MEASUREHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_MEASUREHANDLER_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 1c25da6..d069106 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -23,7 +23,7 @@
 #include "PropertyMap.hxx"
 
 #include <DomainMapper.hxx>
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 
 #include <editeng/numitem.hxx>
 
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index 551b8df..02442c6 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_OLEHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_OLEHANDLER_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/Point.hpp>
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index a3a6325..bfcd27d 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -22,7 +22,7 @@
 #include "BorderHandler.hxx"
 #include "PropertyMap.hxx"
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 
 #include <com/sun/star/table/BorderLine2.hpp>
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index d3fac36..fe2f422 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SECTIONCOLUMNHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SECTIONCOLUMNHANDLER_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <vector>
 
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index 9c30791..739bfc5 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SETTINGSTABLE_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SETTINGSTABLE_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <map>
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 5e2ba51..2250ae4 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include "PropertyMap.hxx"
 #include "FontTable.hxx"
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 
 namespace com{ namespace sun { namespace star { namespace text{
     class XTextDocument;
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index abc9ac0..d8e034e 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TDEFTABLEHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TDEFTABLEHANDLER_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <vector>
 namespace com{ namespace sun{ namespace star{
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index babb180..ff44104 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEPOSITIONHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEPOSITIONHANDLER_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 8ec2dcc..36b1f2c 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -23,7 +23,7 @@
 #include "TablePropertiesHandler.hxx"
 
 #include <DomainMapper.hxx>
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <comphelper/sequenceasvector.hxx>
 
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index c1f0a37..043b94b 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -11,7 +11,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TEXTEFFECTSHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TEXTEFFECTSHANDLER_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index 58b55b7..50856b2 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_THEMETABLE_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_THEMETABLE_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx
index 419c488..7d48db0 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.hxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TRACKCHANGESHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TRACKCHANGESHANDLER_HXX
 
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <DomainMapper_Impl.hxx>
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index af6fdde..38e5c17 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -22,7 +22,7 @@
 
 #include <deque>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <resourcemodel/LoggedResources.hxx>
+#include "LoggedResources.hxx"
 #include <tools/fract.hxx>
 #include <comphelper/sequenceasvector.hxx>
 
commit f7a87bf8377ae85344213bd3f3710e73d6ee7890
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Dec 13 20:45:25 2014 +0100

    writerfilter: only dmapper needs DomainMapper.hxx
    
    Change-Id: I9508938754cf353ecc210eb13d7063ac7ef437bf

diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
similarity index 98%
rename from writerfilter/inc/dmapper/DomainMapper.hxx
rename to writerfilter/source/dmapper/DomainMapper.hxx
index 6564e32..1f20038 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_WRITERFILTER_INC_DMAPPER_DOMAINMAPPER_HXX
-#define INCLUDED_WRITERFILTER_INC_DMAPPER_DOMAINMAPPER_HXX
+#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPER_HXX
+#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPER_HXX
 
 #include <dmapper/DomainMapperFactory.hxx>
 #include <resourcemodel/LoggedResources.hxx>
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 4f11192..99340ea 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -33,7 +33,7 @@
 #include <o3tl/numeric.hxx>
 #include <ooxml/resourceids.hxx>
 #include <dmapperLoggers.hxx>
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
 #include <rtl/math.hxx>
 
 namespace writerfilter {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 11e58cd..535772b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -35,7 +35,7 @@
 
 #include <ooxml/resourceids.hxx>
 
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
 #include "DomainMapperTableManager.hxx"
 #include "PropertyMap.hxx"
 #include "FontTable.hxx"
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index ae3a5a9..bcd78f4 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -51,7 +51,7 @@
 
 #include <oox/drawingml/drawingmltypes.hxx>
 
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
 #include <dmapper/GraphicZOrderHelper.hxx>
 #include <ooxml/resourceids.hxx>
 #include <resourcemodel/ResourceModelHelper.hxx>
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 5a180cf..1c25da6 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -22,7 +22,7 @@
 
 #include "PropertyMap.hxx"
 
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
 #include <resourcemodel/LoggedResources.hxx>
 
 #include <editeng/numitem.hxx>
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index e2c94be..b04c927 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <OLEHandler.hxx>
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
 #include <PropertyMap.hxx>
 #include "GraphicHelpers.hxx"
 
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index f999712..89e00d9 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -18,7 +18,6 @@
  */
 #include <resourcemodel/ResourceModelHelper.hxx>
 #include <StyleSheetTable.hxx>
-#include <dmapper/DomainMapper.hxx>
 #include <NumberingManager.hxx>
 #include <ConversionHelper.hxx>
 #include <TblStylePrHandler.hxx>
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index ada4302..5e2ba51 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -21,7 +21,7 @@
 
 #include "TblStylePrHandler.hxx"
 
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include "PropertyMap.hxx"
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index c951612..4bc10ec 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <dmapperLoggers.hxx>
 #include <oox/token/tokens.hxx>
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
 
 using namespace com::sun::star;
 using namespace oox;
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 3191efa..8ec2dcc 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -22,7 +22,7 @@
 
 #include "TablePropertiesHandler.hxx"
 
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
 #include <resourcemodel/LoggedResources.hxx>
 #include <boost/shared_ptr.hpp>
 #include <comphelper/sequenceasvector.hxx>
diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/writerfilter/source/dmapper/domainmapperfactory.cxx
index e396534..bf9810f 100644
--- a/writerfilter/source/dmapper/domainmapperfactory.cxx
+++ b/writerfilter/source/dmapper/domainmapperfactory.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <dmapper/DomainMapper.hxx>
+#include <DomainMapper.hxx>
 
 namespace writerfilter
 {
commit 7012e5fc7509f2c61dcde736103edc5087a62909
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Dec 13 20:45:19 2014 +0100

    Avoid '#include "../'
    
    Change-Id: I1ae598269b81095dc7d6ad83044f228d1297bfb8

diff --git a/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx b/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
new file mode 100644
index 0000000..60c6b49
--- /dev/null
+++ b/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_WRITERFILTER_INC_DMAPPER_GRAPHICZORDERHELPER_HXX
+#define INCLUDED_WRITERFILTER_INC_DMAPPER_GRAPHICZORDERHELPER_HXX
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <map>
+
+namespace writerfilter
+{
+namespace dmapper
+{
+class GraphicZOrderHelper
+{
+public:
+    void addItem(css::uno::Reference<css::beans::XPropertySet> const& props, sal_Int32 relativeHeight);
+    sal_Int32 findZOrder(sal_Int32 relativeHeight, bool bOldStyle = false);
+private:
+    typedef std::map< sal_Int32, css::uno::Reference<css::beans::XPropertySet> > Items;
+    Items items;
+};
+
+} // namespace dmapper
+} // namespace writerfilter
+
+#endif // INCLUDED_WRITERFILTER_INC_DMAPPER_GRAPHICZORDERHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 4e06ded..2397bd3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -68,6 +68,7 @@
 #include <CellColorHandler.hxx>
 #include <SectionColumnHandler.hxx>
 #include <GraphicHelpers.hxx>
+#include <dmapper/GraphicZOrderHelper.hxx>
 
 using namespace ::com::sun::star;
 using namespace oox;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7de9fb5..b26a29f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -67,6 +67,7 @@
 #include <com/sun/star/text/XTextColumns.hpp>
 #include <oox/mathml/import.hxx>
 #include <GraphicHelpers.hxx>
+#include <dmapper/GraphicZOrderHelper.hxx>
 
 #ifdef DEBUG_WRITERFILTER
 #include <dmapperLoggers.hxx>
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index aca4c1f..0dfc80e 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -18,6 +18,7 @@
  */
 #include "ConversionHelper.hxx"
 #include "GraphicHelpers.hxx"
+#include <dmapper/GraphicZOrderHelper.hxx>
 #include "PropertyIds.hxx"
 
 #include <ooxml/resourceids.hxx>
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index 946c37f..f77efc0 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -70,17 +70,6 @@ public:
 };
 typedef boost::shared_ptr<WrapHandler> WrapHandlerPtr;
 
-class GraphicZOrderHelper
-{
-public:
-    void addItem(css::uno::Reference<css::beans::XPropertySet> const& props,
-                 sal_Int32 relativeHeight);
-    sal_Int32 findZOrder( sal_Int32 relativeHeight, bool bOldStyle = false );
-private:
-    typedef std::map< sal_Int32, css::uno::Reference< css::beans::XPropertySet > > Items;
-    Items items;
-};
-
 } }
 
 #endif
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 019dd54..ae3a5a9 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -52,6 +52,7 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 
 #include <dmapper/DomainMapper.hxx>
+#include <dmapper/GraphicZOrderHelper.hxx>
 #include <ooxml/resourceids.hxx>
 #include <resourcemodel/ResourceModelHelper.hxx>
 
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index a9e742a..8df4a6a 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -25,8 +25,6 @@
 #include <ooxml/resourceids.hxx>
 #include <filter/msfilter/util.hxx>
 #include <svx/svdtrans.hxx>
-#include <dmapper/DomainMapper.hxx>
-#include "../dmapper/GraphicHelpers.hxx"
 #include <rtfsdrimport.hxx>
 #include <rtfreferenceproperties.hxx>
 #include <oox/vml/vmlformatting.hxx>
@@ -121,11 +119,8 @@ void RTFSdrImport::popParent()
 void RTFSdrImport::resolveDhgt(uno::Reference<beans::XPropertySet> const& xPropertySet,
                                sal_Int32 const nZOrder, bool const bOldStyle)
 {
-    writerfilter::dmapper::DomainMapper& rMapper =
-        dynamic_cast<writerfilter::dmapper::DomainMapper&>(m_rImport.Mapper());
-    writerfilter::dmapper::GraphicZOrderHelper* pHelper = rMapper.graphicZOrderHelper();
-    xPropertySet->setPropertyValue("ZOrder", uno::makeAny(pHelper->findZOrder(nZOrder, bOldStyle)));
-    pHelper->addItem(xPropertySet, nZOrder);
+    xPropertySet->setPropertyValue("ZOrder", uno::makeAny(m_aGraphicZOrderHelper.findZOrder(nZOrder, bOldStyle)));
+    m_aGraphicZOrderHelper.addItem(xPropertySet, nZOrder);
 }
 
 void RTFSdrImport::resolveFLine(uno::Reference<beans::XPropertySet> const& xPropertySet,
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index 8135ada..ed7feb6 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -13,6 +13,7 @@
 #include <stack>
 
 #include <rtfdocumentimpl.hxx>
+#include <dmapper/GraphicZOrderHelper.hxx>
 
 namespace writerfilter
 {
@@ -66,6 +67,7 @@ private:
     bool m_bTextFrame;
     /// if inside \pict, but actually it's a shape (not a picture)
     bool m_bFakePict;
+    writerfilter::dmapper::GraphicZOrderHelper m_aGraphicZOrderHelper;
 };
 } // namespace rtftok
 } // namespace writerfilter
commit fa15bd13a974ed29abe1a851f8d7873db26ca455
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Dec 13 20:45:11 2014 +0100

    writerfilter: use DomainMapperFactory
    
    Change-Id: I8053676f9aec8f20dc9753c5651a072c5d80c1f2

diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index 93ed71f..87a81da 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -26,7 +26,7 @@
 #include <unotools/mediadescriptor.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <oox/core/filterdetect.hxx>
-#include <dmapper/DomainMapper.hxx>
+#include <dmapper/DomainMapperFactory.hxx>
 #include <WriterFilter.hxx>
 #include <ooxml/OOXMLDocument.hxx>
 #ifdef DEBUG_WRITERFILTER
@@ -89,8 +89,8 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
 #endif
 
         writerfilter::dmapper::SourceDocumentType eType = writerfilter::dmapper::DOCUMENT_OOXML;
-        writerfilter::dmapper::DomainMapper* aDomainMapper = new writerfilter::dmapper::DomainMapper(m_xContext, xInputStream, m_xDstDoc, bRepairStorage, eType, uno::Reference<text::XTextRange>());
-        writerfilter::Stream::Pointer_t pStream(aDomainMapper);
+        writerfilter::Stream::Pointer_t pStream(
+            writerfilter::dmapper::DomainMapperFactory::createMapper(m_xContext, xInputStream, m_xDstDoc, bRepairStorage, eType, uno::Reference<text::XTextRange>()));
         //create the tokenizer and domain mapper
         writerfilter::ooxml::OOXMLStream::Pointer_t pDocStream = writerfilter::ooxml::OOXMLDocumentFactory::createStream(m_xContext, xInputStream, bRepairStorage);
         uno::Reference<task::XStatusIndicator> xStatusIndicator = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(), uno::Reference<task::XStatusIndicator>());
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index bb0c977..40f5b3b 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -26,7 +26,6 @@
 #include <ooxml/QNameToString.hxx>
 #include <ooxml/resourceids.hxx>
 #include <oox/token/namespaces.hxx>
-#include <dmapper/DomainMapper.hxx>
 #include <dmapper/GraphicHelpers.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
 #include <tools/globname.hxx>

More information about the Libreoffice-commits mailing list