diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-05-16 14:14:48 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-17 09:54:56 +0200 |
commit | 57a23fcb90a3af9ed362dc053c4112f844a81a2c (patch) | |
tree | 9a09d3486f152f396b406e4f4c7d6ae025463518 /svx/source/accessibility/AccessibleControlShape.cxx | |
parent | aaa44dc0b07262d2fcae8f6136566baa6c8c169d (diff) |
allow a OutputDevice parent where that is sufficient
Change-Id: I2920ea1a82de5eacbfeceafbb3c63693dd4365db
Reviewed-on: https://gerrit.libreoffice.org/72414
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/accessibility/AccessibleControlShape.cxx')
-rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 4721672ee00e..09dd1fb887bb 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -189,7 +189,7 @@ void AccessibleControlShape::Init() // I'm aware of at the moment ..... // get the control which belongs to our model (relative to our view) - const OutputDevice* pViewWindow = maShapeTreeInfo.GetWindow(); + const OutputDevice* pViewWindow = maShapeTreeInfo.GetDevice(); SdrUnoObj* pUnoObjectImpl = dynamic_cast<SdrUnoObj*>( GetSdrObjectFromXShape(mxShape) ); SdrView* pView = maShapeTreeInfo.GetSdrView(); OSL_ENSURE( pView && pViewWindow && pUnoObjectImpl, "AccessibleControlShape::Init: no view, or no view window, no SdrUnoObj!" ); @@ -637,7 +637,7 @@ void SAL_CALL AccessibleControlShape::disposing() if ( m_bWaitingForControl ) { OSL_FAIL( "AccessibleControlShape::disposing: this should never happen!" ); - Reference< XContainer > xContainer = lcl_getControlContainer( maShapeTreeInfo.GetWindow(), maShapeTreeInfo.GetSdrView() ); + Reference< XContainer > xContainer = lcl_getControlContainer( maShapeTreeInfo.GetDevice(), maShapeTreeInfo.GetSdrView() ); if ( xContainer.is() ) { m_bWaitingForControl = false; |