From 0e16b40d8b68f73731b4aa9059d0f98d0489fed0 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Thu, 19 Aug 2021 09:10:42 +0300
Subject: 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>
---
 sc/source/filter/excel/xeescher.cxx               | 2 +-
 sc/source/filter/xcl97/xcl97esc.cxx               | 4 ++--
 sc/source/filter/xcl97/xcl97rec.cxx               | 2 +-
 sc/source/filter/xml/xmlcelli.cxx                 | 2 +-
 sc/source/filter/xml/xmlexprt.cxx                 | 2 +-
 sc/source/ui/Accessibility/AccessibleDocument.cxx | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sc')

diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 28ddc36e6b2b..3d3d23520e94 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1842,7 +1842,7 @@ XclExpShapeObj::XclExpShapeObj( XclExpObjectManager& rRoot, css::uno::Reference<
     XclObjAny( rRoot, xShape, pDoc ),
     XclMacroHelper( rRoot )
 {
-    if( SdrObject* pSdrObj = ::GetSdrObjectFromXShape( xShape ) )
+    if (SdrObject* pSdrObj = SdrObject::getSdrObjectFromXShape(xShape))
     {
         ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pSdrObj );
         if ( pInfo && !pInfo->GetMacro().isEmpty() )
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index e64e7326d58c..7778944ccfd7 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -194,7 +194,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
     }
     aStack.push( std::make_pair( pCurrXclObj, std::move(pCurrAppData) ) );
     pCurrAppData.reset( new XclEscherHostAppData );
-    SdrObject* pObj = GetSdrObjectFromXShape( rxShape );
+    SdrObject* pObj = SdrObject::getSdrObjectFromXShape(rxShape);
     //added for exporting OCX control
     sal_Int16 nMsCtlType = 0;
     if ( !pObj )
@@ -548,7 +548,7 @@ void ShapeInteractionHelper::PopulateShapeInteractionInfo(const XclExpObjectMana
         SvMemoryStream* pMemStrm = nullptr;
         OUString sHyperLink;
         OUString sMacro;
-        SdrObject* pObj = GetSdrObjectFromXShape(xShape);
+        SdrObject* pObj = SdrObject::getSdrObjectFromXShape(xShape);
         if (pObj)
             sHyperLink = pObj->getHyperlink();
         if (ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo(pObj))
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index e16c6d9021bf..3a05578f14e2 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1285,7 +1285,7 @@ void XclObjAny::SaveXml( XclExpXmlStream& rStrm )
         return;
 
     // Do not output any of the detective shapes and validation circles.
-    SdrObject* pObject = GetSdrObjectFromXShape(mxShape);
+    SdrObject* pObject = SdrObject::getSdrObjectFromXShape(mxShape);
     if (pObject)
     {
         ScDocument& rDoc = rStrm.GetRoot().GetDoc();
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 7ec86ddb125b..33030fd22c03 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -839,7 +839,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos)
     if( mxAnnotationData->mxShape.is() && mxAnnotationData->mxShapes.is() )
     {
         OSL_ENSURE( mxAnnotationData->mxShapes.get() == xShapes.get(), "ScXMLTableRowCellContext::SetAnnotation - different drawing pages" );
-        SdrObject* pObject = ::GetSdrObjectFromXShape( mxAnnotationData->mxShape );
+        SdrObject* pObject = SdrObject::getSdrObjectFromXShape(mxAnnotationData->mxShape);
         OSL_ENSURE( pObject, "ScXMLTableRowCellContext::SetAnnotation - cannot get SdrObject from shape" );
 
         /*  Try to reuse the drawing object already created (but only if the
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index b1310fbe953c..94290b35c895 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3458,7 +3458,7 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell)
             // needs it as if there were no hidden rows or columns. We manipulate the geometry
             // accordingly for writing xml markup and restore geometry later.
             bool bNeedsRestore = false;
-            SdrObject* pObj = GetSdrObjectFromXShape(rShape.xShape);
+            SdrObject* pObj = SdrObject::getSdrObjectFromXShape(rShape.xShape);
             // Remember original geometry
             std::unique_ptr<SdrObjGeoData> pGeoData;
             if (pObj)
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 23f0d58e36b7..ffaa156877ba 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -933,7 +933,7 @@ bool ScChildrenShapes::FindSelectedShapesChanges(const uno::Reference<drawing::X
     SdrObject *pFocusedObj = nullptr;
     if( mnShapesSelected == 1 && aShapesList.size() == 1)
     {
-        pFocusedObj = GetSdrObjectFromXShape(aShapesList[0]->xShape);
+        pFocusedObj = SdrObject::getSdrObjectFromXShape(aShapesList[0]->xShape);
     }
     std::sort(aShapesList.begin(), aShapesList.end(), ScShapeDataLess());
     SortedShapes vecSelectedShapeAdd;
-- 
cgit