tdf#138995 DOCX import: fix handling of textbox zorders

Regression from commit d379d18666aa42031359ca8eb34b0021960347ae (oox:
import WPS shape with text as shape with textbox, 2014-06-18), the
problem was that a textbox's shape + textframe are internally 2 sdr
objects, so once GraphicZOrderHelper knows the current shape should be
on top of a shape+frame pair, it should suggest a larger ZOrder.

This is necessary till there is no setter version of
SwTextBoxHelper::getOrdNum(), which would allow import filters to ignore
this complexity, but that would be a larger change.

Change-Id: Ibbb1bcd9301eb369f25f211120f62be7c59b0fd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109111
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

1 files changed, 14 insertions, 0 deletions

diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 0bd7354fd962..d4fc4b9a8c09 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -295,6 +295,20 @@ sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 relativeHeight, bool bOldSt
             return 0;
         --it;
         itemZOrderOffset = 1; // after the topmost
+
+        // Check if this shape has a textbox. If so, the textbox will have its own ZOrder, so
+        // suggest a larger offset.
+        bool bTextBox = false;
+        uno::Reference<beans::XPropertySet> xShape = it->second;
+        uno::Reference<beans::XPropertySetInfo> xInfo = xShape->getPropertySetInfo();
+        if (xInfo->hasPropertyByName("TextBox"))
+        {
+            xShape->getPropertyValue("TextBox") >>= bTextBox;
+        }
+        if (bTextBox)
+        {
+            ++itemZOrderOffset;
+        }
     }
     // SwXFrame::getPropertyValue throws uno::RuntimeException
     // when its GetFrameFormat() returns nullptr