diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-01-08 19:12:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-01-09 07:36:14 +0100 |
| commit | fc0002ccf295f8d41ae5d0fee3213af8a0996ebb (patch) | |
| tree | 8e02612c4d76e2d643aa5fec5ffbe9500967ecfd /svx | |
| parent | 621c189173b35ac7f5ce4c578f57045479c63ab6 (diff) | |
AccessibleShapeTreeInfo needs a vcl::Window
no point in passing an OutputDevice there
Change-Id: I6da9b29a0e6f57ad6a8ebcb6113987ee25419483
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108988
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 4 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleShapeTreeInfo.cxx | 2 | ||||
| -rw-r--r-- | svx/source/accessibility/GraphCtlAccessibleContext.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 74b8021ea38f..79cba1292c2c 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -186,7 +186,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.GetDevice(); + const vcl::Window* pViewWindow = maShapeTreeInfo.GetWindow(); 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!" ); @@ -632,7 +632,7 @@ void SAL_CALL AccessibleControlShape::disposing() if ( m_bWaitingForControl ) { OSL_FAIL( "AccessibleControlShape::disposing: this should never happen!" ); - Reference< XContainer > xContainer = lcl_getControlContainer( maShapeTreeInfo.GetDevice(), maShapeTreeInfo.GetSdrView() ); + Reference< XContainer > xContainer = lcl_getControlContainer( maShapeTreeInfo.GetWindow(), maShapeTreeInfo.GetSdrView() ); if ( xContainer.is() ) { m_bWaitingForControl = false; diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index edc7ef8a9641..df6136f94528 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -102,7 +102,7 @@ void AccessibleShapeTreeInfo::SetController ( mxController = rxController; } -void AccessibleShapeTreeInfo::SetDevice(OutputDevice* pDevice) +void AccessibleShapeTreeInfo::SetWindow(vcl::Window* pDevice) { mpWindow = pDevice; } diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index ffe195b4d990..5eb01420269f 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -91,7 +91,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( } maTreeInfo.SetSdrView( mpView ); - maTreeInfo.SetDevice(&mpControl->GetDrawingArea()->get_ref_device()); + maTreeInfo.SetWindow(&dynamic_cast<vcl::Window&>(mpControl->GetDrawingArea()->get_ref_device())); maTreeInfo.SetViewForwarder( this ); } |