diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-08-19 09:10:42 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-08-19 09:31:06 +0200 |
| commit | 0e16b40d8b68f73731b4aa9059d0f98d0489fed0 (patch) | |
| tree | 73092889efb0e57cdc180025503e863f26c6ebfe /svx/source/accessibility | |
| parent | 69f4abe1248f9919f242920b463c4d5f4965211f (diff) | |
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>
Diffstat (limited to 'svx/source/accessibility')
| -rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 2 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index c23cb16faeca..ef04fcb8625f 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -188,7 +188,7 @@ void AccessibleControlShape::Init() // get the control which belongs to our model (relative to our view) const vcl::Window* pViewWindow = maShapeTreeInfo.GetWindow(); - SdrUnoObj* pUnoObjectImpl = dynamic_cast<SdrUnoObj*>( GetSdrObjectFromXShape(mxShape) ); + SdrUnoObj* pUnoObjectImpl = dynamic_cast<SdrUnoObj*>(SdrObject::getSdrObjectFromXShape(mxShape)); SdrView* pView = maShapeTreeInfo.GetSdrView(); OSL_ENSURE( pView && pViewWindow && pUnoObjectImpl, "AccessibleControlShape::Init: no view, or no view window, no SdrUnoObj!" ); diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 7cad4582b4f6..5fbf4f4ebdec 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -103,7 +103,7 @@ AccessibleShape::AccessibleShape ( m_nIndexInParent(-1), mpParent (rShapeInfo.mpChildrenManager) { - m_pShape = GetSdrObjectFromXShape(mxShape); + m_pShape = SdrObject::getSdrObjectFromXShape(mxShape); UpdateNameAndDescription(); } @@ -149,7 +149,7 @@ void AccessibleShape::Init() return; // #107948# Determine whether shape text is empty - SdrObject* pSdrObject = GetSdrObjectFromXShape(mxShape); + SdrObject* pSdrObject = SdrObject::getSdrObjectFromXShape(mxShape); if( !pSdrObject ) return; @@ -1116,8 +1116,8 @@ struct XShapePosCompareHelper bool operator() ( const uno::Reference<drawing::XShape>& xshape1, const uno::Reference<drawing::XShape>& xshape2 ) const { - SdrObject* pObj1 = GetSdrObjectFromXShape(xshape1); - SdrObject* pObj2 = GetSdrObjectFromXShape(xshape2); + SdrObject* pObj1 = SdrObject::getSdrObjectFromXShape(xshape1); + SdrObject* pObj2 = SdrObject::getSdrObjectFromXShape(xshape2); if(pObj1 && pObj2) return pObj1->GetOrdNum() < pObj2->GetOrdNum(); else @@ -1146,7 +1146,7 @@ AccessibleShape::getGroupPosition( const uno::Any& ) { return aRet; } - SdrObject *pObj = GetSdrObjectFromXShape(mxShape); + SdrObject *pObj = SdrObject::getSdrObjectFromXShape(mxShape); if(pObj == nullptr ) @@ -1227,7 +1227,7 @@ OUString AccessibleShape::getObjectLink( const uno::Any& ) { OUString aRet; - SdrObject *pObj = GetSdrObjectFromXShape(mxShape); + SdrObject *pObj = SdrObject::getSdrObjectFromXShape(mxShape); if(pObj == nullptr ) { return aRet; |