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>

5 files changed, 6 insertions, 6 deletions

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index a8685d8c14a3..21609b3a9c8e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -670,7 +670,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133473_shadowSize, "tdf133473.docx")
 {
     uno::Reference<drawing::XShape> xShape = getShape(1);
 
-    SdrObject* pObj(GetSdrObjectFromXShape(xShape));
+    SdrObject* pObj(SdrObject::getSdrObjectFromXShape(xShape));
     const SfxItemSet& rSet = pObj->GetMergedItemSet();
     sal_Int32 nSize1 = rSet.Get(SDRATTR_SHADOWSIZEX).GetValue();
 
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index a3a029342692..a79863f65047 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1613,7 +1613,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=fa
         ::accessibility::AccessibleShape *pAccShape = rpShape.get();
         if (pAccShape)
         {
-            SdrObject *pObj = GetSdrObjectFromXShape(pAccShape->GetXShape());
+            SdrObject *pObj = SdrObject::getSdrObjectFromXShape(pAccShape->GetXShape());
             SwFrameFormat *pFrameFormat = pObj ? FindFrameFormat( pObj ) : nullptr;
             if (pFrameFormat)
             {
@@ -2084,7 +2084,7 @@ void SwAccessibleMap::AddGroupContext(const SdrObject *pParentObj, uno::Referenc
                     uno::Reference < drawing::XShape > xShape = pAccShape->GetXShape();
                     if (xShape.is())
                     {
-                        SdrObject* pObj = GetSdrObjectFromXShape(xShape);
+                        SdrObject* pObj = SdrObject::getSdrObjectFromXShape(xShape);
                         AddShapeContext(pObj, xChild);
                         AddGroupContext(pObj,xChild);
                     }
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 0e5d92009d54..c98f7689c4be 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2995,7 +2995,7 @@ sal_uInt32 SwEscherEx::QueryTextID(
     const uno::Reference< drawing::XShape>& xXShapeRef, sal_uInt32 nShapeId )
 {
     sal_uInt32 nId = 0;
-    if (SdrObject* pObj = GetSdrObjectFromXShape(xXShapeRef))
+    if (SdrObject* pObj = SdrObject::getSdrObjectFromXShape(xXShapeRef))
     {
         pTextBxs->Append( *pObj, nShapeId );
         nId = pTextBxs->Count();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 09065cc441c3..a6559a681a8c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -536,7 +536,7 @@ SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId,
         if ( (!(rReader.m_bIsHeader || rReader.m_bIsFooter)) &&
             rReader.m_xFormImpl->ReadOCXStream(xSrc,&xShape,true))
         {
-            pRet = GetSdrObjectFromXShape(xShape);
+            pRet = SdrObject::getSdrObjectFromXShape(xShape);
         }
         else
         {
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index e9d33456dd94..99f2647db76b 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -389,7 +389,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
         OSL_ENSURE(m_xFormImpl, "Impossible");
         if (m_xFormImpl && m_xFormImpl->ReadOCXStream(xSrc1, &xRef))
         {
-            pRet = GetSdrObjectFromXShape(xRef);
+            pRet = SdrObject::getSdrObjectFromXShape(xRef);
             OSL_ENSURE(pRet, "Impossible");
             if (pRet)
                 pRet->SetLogicRect(aRect);