diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-20 16:44:21 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-20 16:57:49 +0100 |
commit | 01fc08c0b5c57fef8ad3755672f4266d85e849a5 (patch) | |
tree | 9f1a7f71281feae7e9be344a94371495f1a77338 /sw/source/core/unocore | |
parent | 3d601cfa4b63580b5a0d18044b5792894d54089f (diff) |
fdo#85554 SwXShape: fix getting ZOrder property when doc contains TextBoxes
Change-Id: I9b6b83f0f6d627bb14a880a19769ee70564cf52b
Diffstat (limited to 'sw/source/core/unocore')
-rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 13 |
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; |