impress190: merge with dev300_m80

1 files changed, 0 insertions, 40 deletions

diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index fdda65a3d970..f31c960d432d 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -729,22 +729,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);
     }
@@ -902,30 +886,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;