diff options
author | Christian Lippka <cl@openoffice.org> | 2010-04-16 12:48:58 +0200 |
---|---|---|
committer | Christian Lippka <cl@openoffice.org> | 2010-04-16 12:48:58 +0200 |
commit | df66a0ddc600f4cb495d074067dd0184a141054f (patch) | |
tree | f75f93ef2cc1a963abc38cba4d841523756b39b7 /sd | |
parent | aef481eed78350b8b943128fedb3d024b84301ea (diff) |
#i110938# removed z-index hack after background shape was removed
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 54c3f88a6916..d4ea1dce196f 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -737,22 +737,6 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, aAny <<= aName; } } - else if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_zorder ) ) ) - { - SdrObject* pObj = mpShape->GetSdrObject(); - SdPage* pPage = pObj ? (SdPage*)pObj->GetPage() : NULL; - if( pPage && pPage == pObj->GetObjList() && pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD ) - { - sal_Int32 nOrdNum; - if( aAny >>= nOrdNum ) - { - // if this is a masterpage, there is always a background shape with the ord num 0 - // so we add one to the api ordnum to hide the background shape over the api - nOrdNum++; - aAny <<= nOrdNum; - } - } - } mpShape->_setPropertyValue(aPropertyName, aAny); } @@ -910,30 +894,6 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, aRet <<= aName; } } - else if( PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_zorder ) ) ) - { - SdrObject* pObj = mpShape->GetSdrObject(); - SdPage* pPage = pObj ? (SdPage*)pObj->GetPage() : NULL; - if( pPage && pPage == pObj->GetObjList() && pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD ) - { - sal_Int32 nOrdNum; - if( aRet >>= nOrdNum ) - { - // if this is a masterpage, there is always a background shape with the ord num 0 - // so we add one to the api ordnum to hide the background shape over the api - if( nOrdNum > 0 ) - { - nOrdNum--; - aRet <<= nOrdNum; - } - else - { - DBG_ERROR( "Masterpage without a background shape, ZOrder property will be corrupt!" ); - } - } - } - } - } return aRet; |