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>

3 files changed, 5 insertions, 12 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;
diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
index 837c73081ea7..88d24ac1d86f 100644
--- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
@@ -72,14 +72,12 @@ AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleSha
     return *this;
 }
 
-
 AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo()
 {
     SolarMutexGuard g;
     mpWindow.reset();
 }
 
-
 void AccessibleShapeTreeInfo::SetDocumentWindow (
     const Reference<XAccessibleComponent>& rxDocumentWindow)
 {
@@ -93,32 +91,27 @@ void AccessibleShapeTreeInfo::SetModelBroadcaster (
     mxModelBroadcaster = rxModelBroadcaster;
 }
 
-
 void AccessibleShapeTreeInfo::SetSdrView (SdrView* pView)
 {
     mpView = pView;
 }
 
-
 void AccessibleShapeTreeInfo::SetController (
     const Reference<frame::XController>& rxController)
 {
     mxController = rxController;
 }
 
-
-void AccessibleShapeTreeInfo::SetWindow (vcl::Window* pWindow)
+void AccessibleShapeTreeInfo::SetDevice(OutputDevice* pDevice)
 {
-    mpWindow = pWindow;
+    mpWindow = pDevice;
 }
 
-
 void AccessibleShapeTreeInfo::SetViewForwarder (const IAccessibleViewForwarder* pViewForwarder)
 {
     mpViewForwarder = pViewForwarder;
 }
 
-
 } // end of namespace accessibility
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 23584422480f..065515de3604 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -96,7 +96,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
     }
 
     maTreeInfo.SetSdrView( mpView );
-    maTreeInfo.SetWindow( mpControl );
+    maTreeInfo.SetDevice( mpControl );
     maTreeInfo.SetViewForwarder( this );
 }