diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-05-23 15:44:02 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-05-23 15:54:11 +0200 |
| commit | 9365a3255875eb75923903c8b3d47066aa679c3b (patch) | |
| tree | acff9fff9d5f68c2ab556c2732f0a731f5bebc01 | |
| parent | 597000c2edc3c3fb40134e892a5e9ceec0d83296 (diff) | |
fix UNO ZOrder reading, take #2
This is almost a revert of e05e77f4b7373b686f02cc51c7003e72efb07053.
It turns out FindRealSdrObject() is mostly the right method to call
(possibly except when creating the document, which is what lead
to the first commit).
Change-Id: Iea9ccc99e785fbff47f2d41187326d4e6d355494
| -rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 91c8d89a2aa9..6b9c92a9f605 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1598,7 +1598,9 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) } else if(FN_UNO_Z_ORDER == pEntry->nWID) { - const SdrObject* pObj = pFmt->FindSdrObject(); + const SdrObject* pObj = pFmt->FindRealSdrObject(); + if( pObj == NULL ) + pObj = pFmt->FindSdrObject(); if( pObj ) { aAny <<= (sal_Int32)pObj->GetOrdNum(); |