diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /winaccessibility | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'winaccessibility')
3 files changed, 5 insertions, 5 deletions
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx index c509caea6b50..29cb395720ba 100644 --- a/winaccessibility/source/service/AccFrameEventListener.cxx +++ b/winaccessibility/source/service/AccFrameEventListener.cxx @@ -88,7 +88,7 @@ void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue) VCLXWindow* pvclwindow = dynamic_cast<VCLXWindow*>(m_xAccessible.get()); - Window* window = pvclwindow->GetWindow(); + vcl::Window* window = pvclwindow->GetWindow(); const SystemEnvData* systemdata=window->GetSystemData(); //add this child diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx index a3df23bb2e96..ef89bfb0299d 100644 --- a/winaccessibility/source/service/AccTopWindowListener.cxx +++ b/winaccessibility/source/service/AccTopWindowListener.cxx @@ -53,7 +53,7 @@ void AccTopWindowListener::HandleWindowOpened( com::sun::star::accessibility::XA { //get SystemData from window VCLXWindow* pvclwindow = (VCLXWindow*)pAccessible; - Window* window = pvclwindow->GetWindow(); + vcl::Window* window = pvclwindow->GetWindow(); // The SalFrame of window may be destructed at this time const SystemEnvData* systemdata = NULL; try diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index b53f5dc9270f..fd1142f9987f 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -147,7 +147,7 @@ Sequence< OUString > MSAAServiceImpl::getSupportedServiceNames() throw (RuntimeE } static void AccessBridgeHandleExistingWindow(const Reference< XMSAAService > &xAccMgr, - Window *pWindow, bool bShow) + vcl::Window *pWindow, bool bShow) { if ( pWindow ) { @@ -156,7 +156,7 @@ static void AccessBridgeHandleExistingWindow(const Reference< XMSAAService > &xA SAL_INFO( "iacc2", "Decide whether to register existing window with IAccessible2" ); // Test for combo box - drop down floating windows first - Window * pParentWindow = pWindow->GetParent(); + vcl::Window * pParentWindow = pWindow->GetParent(); if ( pParentWindow ) { @@ -221,7 +221,7 @@ static void AccessBridgeUpdateOldTopWindows( const Reference< XMSAAService > &xA for ( sal_uInt16 i = 0; i < nTopWindowCount; i++ ) { - Window* pTopWindow = Application::GetTopWindow( i ); + vcl::Window* pTopWindow = Application::GetTopWindow( i ); css::uno::Reference< css::accessibility::XAccessible > xAccessible = pTopWindow->GetAccessible(); if ( xAccessible.is() ) { |