fdo#85554 SwXShape: fix getting ZOrder property when doc contains TextBoxes

Change-Id: I9b6b83f0f6d627bb14a880a19769ee70564cf52b

1 files changed, 13 insertions, 0 deletions

diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index d8b463274a77..b4e0b0bbb68f 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1756,6 +1756,19 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
                 aRet >>= aPath;
                 aRet <<= _ConvertPolyPolygonBezierToLayoutDir( aPath );
             }
+            else if (rPropertyName == "ZOrder")
+            {
+                // Convert the real draw page position to the logical one that ignores textboxes.
+                if (pFmt)
+                {
+                    const SdrObject* pObj = pFmt->FindRealSdrObject();
+                    if (pObj)
+                    {
+                        std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pFmt->GetDoc());
+                        aRet <<= SwTextBoxHelper::getOrdNum(pObj, aTextBoxes);
+                    }
+                }
+            }
         }
     }
     return aRet;