diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-02-04 10:22:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-02-04 11:19:35 +0100 |
| commit | 18982376918c88ec09c2c7fd42ef635e93897b05 (patch) | |
| tree | 33745acca3f3b8155628981b81438a15131fc157 /slideshow/source | |
| parent | 380ab85b6594a013f34f5e6ec69fb569336bbb48 (diff) | |
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>
Diffstat (limited to 'slideshow/source')
| -rw-r--r-- | slideshow/source/engine/slide/shapemanagerimpl.cxx | 3 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/slideimpl.cxx | 3 |
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)) |