From 200cd2b99bee18962a970edc5d059286f6c3ea0e Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Mon, 11 Jan 2021 21:03:34 +0100
Subject: [PATCH] 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>
---
 sw/CppunitTest_sw_core_doc.mk                  |   1 +
 sw/qa/core/doc/data/textbox-zorder.docx        | Bin 0 -> 5407 bytes
 sw/qa/core/doc/doc.cxx                         |  16 ++++++++++++++++
 writerfilter/source/dmapper/GraphicHelpers.cxx |  14 ++++++++++++++
 4 files changed, 31 insertions(+)
 create mode 100644 sw/qa/core/doc/data/textbox-zorder.docx

diff --git a/sw/CppunitTest_sw_core_doc.mk b/sw/CppunitTest_sw_core_doc.mk
index ba2555099e3b..934ccf8eee6f 100644
--- a/sw/CppunitTest_sw_core_doc.mk
+++ b/sw/CppunitTest_sw_core_doc.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_doc, \
     editeng \
     sal \
     sfx \
+    svxcore \
     sw \
 	swqahelper \
     test \
diff --git a/sw/qa/core/doc/data/textbox-zorder.docx b/sw/qa/core/doc/data/textbox-zorder.docx
new file mode 100644
index 0000000000000000000000000000000000000000..d5263f8bbd6b536e03faf49fc04cd5626b58facc
GIT binary patch
literal 5407
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

literal 0
HcmV?d00001

diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx
index d68217d65f30..b1574321320d 100644
--- a/sw/qa/core/doc/doc.cxx
+++ b/sw/qa/core/doc/doc.cxx
@@ -113,6 +113,22 @@ CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testLocaleIndependentTemplate)
     ErrorRegistry::Reset();
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testTextBoxZOrder)
+{
+    SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "textbox-zorder.docx");
+    SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
+    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), rFormats.size());
+    const SwFrameFormat* pEllipse = rFormats[2];
+    const SdrObject* pEllipseShape = pEllipse->FindRealSdrObject();
+    // Make sure we test the right shape.
+    CPPUNIT_ASSERT_EQUAL(OUString("Shape3"), pEllipseShape->GetName());
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 2
+    // - Actual  : 1
+    // i.e. the ellipse was under the frame of the shape-frame pair, not on top of it.
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(2), pEllipseShape->GetOrdNum());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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