Drop GetSdrObjectFromXShape and use SdrObject::getSdrObjectFromXShape

Change-Id: I0d233878ee49fcdc1338ec3bd700e5482d558163
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120694
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

9 files changed, 16 insertions, 16 deletions

diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 61f45e64f692..1bcbbaf904d4 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -1661,7 +1661,7 @@ void SdExportTest::testColumnsODG()
         CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(700)),
                              xColProps->getPropertyValue("AutomaticDistance"));
 
-        auto pTextObj = dynamic_cast<SdrTextObj*>(GetSdrObjectFromXShape(xShape));
+        auto pTextObj = dynamic_cast<SdrTextObj*>(SdrObject::getSdrObjectFromXShape(xShape));
         CPPUNIT_ASSERT(pTextObj);
 
         CPPUNIT_ASSERT_EQUAL(sal_Int16(2), pTextObj->GetTextColumnsNumber());
@@ -1685,7 +1685,7 @@ void SdExportTest::testColumnsODG()
         CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(700)),
                              xColProps->getPropertyValue("AutomaticDistance"));
 
-        auto pTextObj = dynamic_cast<SdrTextObj*>(GetSdrObjectFromXShape(xShape));
+        auto pTextObj = dynamic_cast<SdrTextObj*>(SdrObject::getSdrObjectFromXShape(xShape));
         CPPUNIT_ASSERT(pTextObj);
 
         CPPUNIT_ASSERT_EQUAL(sal_Int16(2), pTextObj->GetTextColumnsNumber());
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 254fc46f69bb..ba888c280601 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -500,7 +500,7 @@ void SdMiscTest::testTextColumns()
         xShapes->add(xShape);
 
         // Set up columns
-        auto pTextObj = dynamic_cast<SdrTextObj*>(GetSdrObjectFromXShape(xShape));
+        auto pTextObj = dynamic_cast<SdrTextObj*>(SdrObject::getSdrObjectFromXShape(xShape));
         CPPUNIT_ASSERT(pTextObj);
         pTextObj->SetMergedItem(SfxInt16Item(SDRATTR_TEXTCOLUMNS_NUMBER, 2));
         pTextObj->SetMergedItem(SdrMetricItem(SDRATTR_TEXTCOLUMNS_SPACING, 1000));
@@ -511,7 +511,7 @@ void SdMiscTest::testTextColumns()
         uno::Reference<container::XIndexAccess> xIndexAccess(xDrawPage, uno::UNO_QUERY_THROW);
         uno::Reference<drawing::XShape> xShape(xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW);
 
-        auto pTextObj = dynamic_cast<SdrTextObj*>(GetSdrObjectFromXShape(xShape));
+        auto pTextObj = dynamic_cast<SdrTextObj*>(SdrObject::getSdrObjectFromXShape(xShape));
         CPPUNIT_ASSERT(pTextObj);
 
         CPPUNIT_ASSERT_EQUAL(sal_Int16(2), pTextObj->GetTextColumnsNumber());
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index ed61bed5cb72..3e7d26ff8065 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -1571,7 +1571,7 @@ void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj )
     ::basegfx::B2DPolyPolygon aPolyPoly;
     if( ::basegfx::utils::importFromSvgD( aPolyPoly, getPath(), true, nullptr ) )
     {
-        SdrObject* pObj = GetSdrObjectFromXShape( getTargetShape() );
+        SdrObject* pObj = SdrObject::getSdrObjectFromXShape(getTargetShape());
         if( pObj )
         {
             SdrPage* pPage = pObj->getSdrPageFromSdrObject();
@@ -1594,7 +1594,7 @@ void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj
 {
     ::basegfx::B2DPolyPolygon aPolyPoly( rPathObj.GetPathPoly() );
 
-    SdrObject* pObj = GetSdrObjectFromXShape( getTargetShape() );
+    SdrObject* pObj = SdrObject::getSdrObjectFromXShape(getTargetShape());
     if( pObj )
     {
         ::tools::Rectangle aBoundRect(0,0,0,0);
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 04a84c3a129e..423a90f3a65a 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1243,7 +1243,7 @@ void PPTWriter::ImplWriteOLE( )
         {
             case NORMAL_OLE_OBJECT :
             {
-                SdrObject* pSdrObj = GetSdrObjectFromXShape( pPtr->xShape );
+                SdrObject* pSdrObj = SdrObject::getSdrObjectFromXShape(pPtr->xShape);
                 if ( auto pSdrOle2Obj = dynamic_cast< SdrOle2Obj* >(pSdrObj) )
                 {
                     const ::uno::Reference < embed::XEmbeddedObject >& xObj( pSdrOle2Obj->GetObjRef() );
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index b5c2bd864a2c..b9d843739029 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1746,7 +1746,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                     if ( aPropOpt.CreateGraphicProperties( mXPropSet, "MetaFile", false ) )
                     {
                         aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
-                        SdrObject* pObj = GetSdrObjectFromXShape( mXShape );
+                        SdrObject* pObj = SdrObject::getSdrObjectFromXShape(mXShape);
                         if ( pObj )
                         {
                             ::tools::Rectangle aBound = pObj->GetCurrentBoundRect();
@@ -2458,7 +2458,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 {
                     if (ePageType == MASTER )
                     {
-                        SdrObject* pObj = GetSdrObjectFromXShape( mXShape );
+                        SdrObject* pObj = SdrObject::getSdrObjectFromXShape(mXShape);
                         if (pObj && pObj->IsNotVisibleAsMaster())
                             continue;
                     }
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index fb5ddb5d686b..3286fa857fa5 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -67,8 +67,8 @@ struct XShapePosCompareHelper
         const uno::Reference<drawing::XShape>& xshape2 ) const
     {
         // modify the compare method to return the Z-Order, not layout order
-        SdrObject* pObj1 = GetSdrObjectFromXShape(xshape1);
-        SdrObject* pObj2 = GetSdrObjectFromXShape(xshape2);
+        SdrObject* pObj1 = SdrObject::getSdrObjectFromXShape(xshape1);
+        SdrObject* pObj2 = SdrObject::getSdrObjectFromXShape(xshape2);
         if(pObj1 && pObj2)
             return pObj1->GetOrdNum() < pObj2->GetOrdNum();
         else
@@ -462,7 +462,7 @@ uno::Sequence< sal_Int32 > SAL_CALL
         if ( xShape.is() )
         {
             //if the object is visible in the page, we add it into the group list.
-            SdrObject* pObj = GetSdrObjectFromXShape(xShape);
+            SdrObject* pObj = SdrObject::getSdrObjectFromXShape(xShape);
             if ( pObj && pPV && pSdView && pSdView->IsObjMarkable( pObj, pPV ) )
             {
                 vXShapes.push_back( xShape );
@@ -505,7 +505,7 @@ OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny )
     {
         return aRet;
     }
-    SdrObject* pObj = GetSdrObjectFromXShape(xCurShape);
+    SdrObject* pObj = SdrObject::getSdrObjectFromXShape(xCurShape);
     if (pObj)
     {
         SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pObj);
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 4585fd335bdc..05a65c7e6307 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2454,7 +2454,7 @@ void CustomAnimationPane::onSelect()
         for( const CustomAnimationEffectPtr& pEffect : maListSelection )
         {
             Reference< XShape > xShape( pEffect->getTargetShape() );
-            SdrObject* pObj = GetSdrObjectFromXShape( xShape );
+            SdrObject* pObj = SdrObject::getSdrObjectFromXShape(xShape);
             if( pObj )
                 pView->MarkObj(pObj, pView->GetSdrPageView());
         }
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 6e4e30ad7183..37ba68c6baba 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1543,7 +1543,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape )
     case ClickAction_VERB:
     {
         // todo, better do it async?
-        SdrObject* pObj = GetSdrObjectFromXShape( xShape );
+        SdrObject* pObj = SdrObject::getSdrObjectFromXShape(xShape);
         SdrOle2Obj* pOleObject = dynamic_cast< SdrOle2Obj* >(pObj);
         if (pOleObject && mpViewShell )
             mpViewShell->ActivateObject(pOleObject, pEvent->mnVerb);
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 78bc5cd6b9dd..4e4a07c1389c 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -604,7 +604,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const c
                 case WID_ANIMPATH:
                 {
                     uno::Reference< drawing::XShape > xShape( aValue, uno::UNO_QUERY );
-                    SdrPathObj* pObj2 = xShape.is() ? dynamic_cast< SdrPathObj* >( GetSdrObjectFromXShape( xShape ) ) : nullptr;
+                    SdrPathObj* pObj2 = xShape.is() ? dynamic_cast<SdrPathObj*>(SdrObject::getSdrObjectFromXShape(xShape)) : nullptr;
 
                     if( pObj2 == nullptr )
                         throw lang::IllegalArgumentException();