use more getSdrObjectFromXShape

Change-Id: Ia237643ab040425f231f781c86e7e060f0b53717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110400
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 9 insertions, 17 deletions

diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index 077031c5c9aa..8acb43d89b15 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -282,17 +282,13 @@ uno::Reference< util::XCloneable > SAL_CALL OShape::createClone(  )
     uno::Reference< report::XReportComponent> xSet;
     try
     {
-        SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xSource );
-        if ( pShape )
+        SdrObject* pObject = SdrObject::getSdrObjectFromXShape( xSource );
+        if ( pObject )
         {
-            SdrObject* pObject = pShape->GetSdrObject();
-            if ( pObject )
+            SdrObject* pClone(pObject->CloneSdrObject(pObject->getSdrModelFromSdrObject()));
+            if ( pClone )
             {
-                SdrObject* pClone(pObject->CloneSdrObject(pObject->getSdrModelFromSdrObject()));
-                if ( pClone )
-                {
-                    xSet.set(pClone->getUnoShape(),uno::UNO_QUERY_THROW );
-                }
+                xSet.set(pClone->getUnoShape(),uno::UNO_QUERY_THROW );
             }
         }
     }
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index 128df5c6fd3d..4c1fcba02f43 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -113,8 +113,7 @@ void OReportPage::insertObject(const uno::Reference< report::XReportComponent >&
     if ( nPos < GetObjCount() )
         return; // Object already in list
 
-    SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( _xObject );
-    OObjectBase* pObject = pShape ? dynamic_cast< OObjectBase* >( pShape->GetSdrObject() ) : nullptr;
+    OObjectBase* pObject = dynamic_cast< OObjectBase* >(SdrObject::getSdrObjectFromXShape( _xObject ));
     OSL_ENSURE( pObject, "OReportPage::insertObject: no implementation object found for the given shape/component!" );
     if ( pObject )
         pObject->StartListening();
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 5ea227f5e184..313969f191cb 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -246,8 +246,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
                 rObject.Value >>= aCopies;
                 for (const uno::Reference<report::XReportComponent>& rCopy : std::as_const(aCopies))
                 {
-                    SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( rCopy );
-                    SdrObject* pObject = pShape ? pShape->GetSdrObject() : nullptr;
+                    SdrObject* pObject = SdrObject::getSdrObjectFromXShape( rCopy );
                     if ( pObject )
                     {
                         // Clone to target SdrModel
@@ -495,8 +494,7 @@ void OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I
             uno::Reference< report::XReportComponent> xReportComponent(m_xSection->getByIndex(i),uno::UNO_QUERY_THROW);
             awt::Point aPos = xReportComponent->getPosition();
             awt::Size aSize = xReportComponent->getSize();
-            SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xReportComponent );
-            SdrObject* pObject = pShape ? pShape->GetSdrObject() : nullptr;
+            SdrObject* pObject = SdrObject::getSdrObjectFromXShape( xReportComponent );
             if ( pObject )
             {
                 bool bChanged = false;
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 2274e85ca529..4f7cc5be2d7e 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -613,8 +613,7 @@ void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepor
             OSectionWindow* pSectionWindow = getSectionWindow(xSection);
             if ( pSectionWindow )
             {
-                SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( rShape );
-                SdrObject* pObject = pShape ? pShape->GetSdrObject() : nullptr;
+                SdrObject* pObject = SdrObject::getSdrObjectFromXShape( rShape );
                 OSL_ENSURE( pObject, "OViewsWindow::setMarked: no SdrObject for the shape!" );
                 if ( pObject )
                     pSectionWindow->getReportSection().getSectionView().MarkObj( pObject, pSectionWindow->getReportSection().getSectionView().GetSdrPageView(), !_bMark );