2 files changed, 2 insertions, 4 deletions
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index 17f21926ac2f..73c7cda1ac02 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -390,8 +390,7 @@ OUString ShapeManagerImpl::checkForImageMap( awt::MouseEvent const& evt ) const
     for (sal_Int32 i = 0; i < mxDrawPage->getCount(); i++)
     {
         Reference<XShape> xShape(mxDrawPage->getByIndex(i), UNO_QUERY_THROW);
-        SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>(xShape);
-        SdrObject* pObj = pShape ? pShape->GetSdrObject() : nullptr;
+        SdrObject* pObj = SdrObject::getSdrObjectFromXShape(xShape);
         if (!pObj)
             continue;
         const IMapObject* pIMapObj = SvxIMapInfo::GetHitIMapObject(pObj, Point(evt.X, evt.Y));
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 58b3203dfb74..f5f5d2a56861 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -396,8 +396,7 @@ void SlideImpl::prefetch()
     for (sal_Int32 i = 0; i < mxDrawPage->getCount(); i++)
     {
         com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape(mxDrawPage->getByIndex(i), com::sun::star::uno::UNO_QUERY_THROW);
-        SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>(xShape);
-        SdrObject* pObj = pShape ? pShape->GetSdrObject() : nullptr;
+        SdrObject* pObj = SdrObject::getSdrObjectFromXShape(xShape);
         if (!pObj)
             continue;
         if( SdrGrafObj* grafObj = dynamic_cast<SdrGrafObj*>(pObj))