8 files changed, 42 insertions, 18 deletions
diff --git a/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx b/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
new file mode 100644
index 000000000000..60c6b493fe85
--- /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 4e06ded2b9e0..2397bd30e742 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 7de9fb50042a..b26a29fe9b62 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 aca4c1f71aed..0dfc80e48b60 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 946c37fcac4c..f77efc0d4ceb 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 019dd5429272..ae3a5a935cda 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 a9e742aabb71..8df4a6aa47c6 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 8135adaec3ec..ed7feb6d1827 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