fdo#60722 import RTF_SHPZ

Change-Id: I6c572d44d93f812d50376ec05ae94bdabadb3f1e

writerfilter/source/dmapper/GraphicHelpers.cxx

@@ -251,7 +251,8 @@ sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 relativeHeight )
     while( it != items.end())
     {
         // std::map is iterated sorted by key
-        if( it->first > relativeHeight )
+        // if there is an item that has the same z-order, we belong under it
+        if( it->first >= relativeHeight )
             break; // this is the first one higher, we belong right before it
         else
             ++it;

writerfilter/source/rtftok/rtfdocumentimpl.cxx

@@ -3187,6 +3187,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
         case RTF_SHPBOTTOM:
             m_aStates.top().aShape.nBottom = TWIP_TO_MM100(nParam);
             break;
+        case RTF_SHPZ:
+            m_aStates.top().aShape.oZ.reset(nParam);
+            break;
         case RTF_FFTYPE:
             switch (nParam)
             {

writerfilter/source/rtftok/rtfdocumentimpl.hxx

@@ -31,6 +31,7 @@
 
 #include <stack>
 #include <queue>
+#include <boost/optional.hpp>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -259,6 +260,7 @@ namespace writerfilter {
                 sal_Int32 nTop;
                 sal_Int32 nRight;
                 sal_Int32 nBottom;
+                boost::optional<sal_Int32> oZ; ///< Z-Order of the shape.
                 sal_Int16 nHoriOrientRelation;
                 sal_Int16 nVertOrientRelation;
                 int nWrap;

writerfilter/source/rtftok/rtfsdrimport.cxx

@@ -298,6 +298,8 @@ void RTFSdrImport::resolve(RTFShape& rShape)
     {
         xPropertySet->setPropertyValue("LineColor", aLineColor);
         xPropertySet->setPropertyValue("LineWidth", aLineWidth);
+        if (rShape.oZ)
+            resolveDhgt(xPropertySet, *rShape.oZ);
     }
 
     if (nType == ESCHER_ShpInst_PictureFrame) // picture frame