diff options
9 files changed, 13 insertions, 16 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index d9c2f7071338..2d4fd3010e4b 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -51,7 +51,7 @@ AccessibleChartShape::AccessibleChartShape( m_aShapeTreeInfo.SetSdrView( rAccInfo.m_pSdrView ); m_aShapeTreeInfo.SetController( nullptr ); - m_aShapeTreeInfo.SetDevice( VCLUnoHelper::GetWindow( rAccInfo.m_xWindow ) ); + m_aShapeTreeInfo.SetWindow( VCLUnoHelper::GetWindow( rAccInfo.m_xWindow ) ); m_aShapeTreeInfo.SetViewForwarder( rAccInfo.m_pViewForwarder ); ::accessibility::ShapeTypeHandler& rShapeHandler = ::accessibility::ShapeTypeHandler::Instance(); diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx index 220bc2649a2e..f9da042b63d8 100644 --- a/include/svx/AccessibleShapeTreeInfo.hxx +++ b/include/svx/AccessibleShapeTreeInfo.hxx @@ -134,7 +134,7 @@ public: /** Set the window that is used to construct SvxTextEditSources which in turn is used to create accessible edit engines. */ - void SetDevice(OutputDevice* pWindow); + void SetWindow(vcl::Window* pWindow); /** Return the current Window. @return @@ -142,11 +142,8 @@ public: */ vcl::Window* GetWindow() const { - if (mpWindow && mpWindow->GetOutDevType() == OUTDEV_WINDOW) - return static_cast<vcl::Window*>(mpWindow.get()); - return nullptr; + return mpWindow.get(); } - OutputDevice* GetDevice() const { return mpWindow;} /** The view forwarder allows the transformation between internal and pixel coordinates and can be asked for the visible area. @@ -188,7 +185,7 @@ private: /** This window is necessary to construct an SvxTextEditSource which in turn is used to create an accessible edit engine. */ - VclPtr<OutputDevice> mpWindow; + VclPtr<vcl::Window> mpWindow; /** The view forwarder allows the transformation between internal and pixel coordinates and can be asked for the visible area. diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index b39230314e2e..f5193c6a80a2 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -331,7 +331,7 @@ ScChildrenShapes::ScChildrenShapes(ScAccessibleDocument* pAccessibleDocument, Sc maShapeTreeInfo.SetModelBroadcaster( new ScDrawModelBroadcaster(rViewData.GetDocument().GetDrawLayer()) ); maShapeTreeInfo.SetSdrView(rViewData.GetScDrawView()); maShapeTreeInfo.SetController(nullptr); - maShapeTreeInfo.SetDevice(pViewShell->GetWindowByPos(meSplitPos)); + maShapeTreeInfo.SetWindow(pViewShell->GetWindowByPos(meSplitPos)); maShapeTreeInfo.SetViewForwarder(mpAccessibleDocument); } } @@ -364,7 +364,7 @@ void ScChildrenShapes::SetDrawBroadcaster() maShapeTreeInfo.SetModelBroadcaster( new ScDrawModelBroadcaster(rViewData.GetDocument().GetDrawLayer()) ); maShapeTreeInfo.SetSdrView(rViewData.GetScDrawView()); maShapeTreeInfo.SetController(nullptr); - maShapeTreeInfo.SetDevice(mpViewShell->GetWindowByPos(meSplitPos)); + maShapeTreeInfo.SetWindow(mpViewShell->GetWindowByPos(meSplitPos)); maShapeTreeInfo.SetViewForwarder(mpAccessibleDocument); } } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 8778e65c7aee..0c974bd5a1c4 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -977,7 +977,7 @@ uno::Reference<XAccessible> ScShapeChildren::GetBackgroundShapeAt(const awt::Poi ::accessibility::AccessibleShapeTreeInfo aShapeTreeInfo; aShapeTreeInfo.SetSdrView(mpViewShell->GetPreview()->GetDrawView()); aShapeTreeInfo.SetController(nullptr); - aShapeTreeInfo.SetDevice(mpViewShell->GetWindow()); + aShapeTreeInfo.SetWindow(mpViewShell->GetWindow()); aShapeTreeInfo.SetViewForwarder(&(maShapeRanges[rShape.mnRangeId].maViewForwarder)); rShape.mpAccShape = rShapeHandler.CreateAccessibleObject(aShapeInfo, aShapeTreeInfo); if (rShape.mpAccShape.is()) diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 67238cb3154c..327ea2eaa64b 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -81,7 +81,7 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase ( mxModel, uno::UNO_QUERY_THROW)); maShapeTreeInfo.SetController (mxController); maShapeTreeInfo.SetSdrView (pViewShell->GetView()); - maShapeTreeInfo.SetDevice (pSdWindow); + maShapeTreeInfo.SetWindow (pSdWindow); maShapeTreeInfo.SetViewForwarder (&maViewForwarder); mxWindow = ::VCLUnoHelper::GetInterface (pSdWindow); 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 ); } diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 4771f4c8e903..38cf49e532c0 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -295,7 +295,7 @@ public: : maMap() { maInfo.SetSdrView( pMap->GetShell()->GetDrawView() ); - maInfo.SetDevice( pMap->GetShell()->GetWin() ); + maInfo.SetWindow( pMap->GetShell()->GetWin() ); maInfo.SetViewForwarder( pMap ); uno::Reference < document::XShapeEventBroadcaster > xModelBroadcaster = new SwDrawModellListener_Impl( |