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 /toolkit/source/controls/accessiblecontrolcontext.cxx | |
| 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 'toolkit/source/controls/accessiblecontrolcontext.cxx')
| -rw-r--r-- | toolkit/source/controls/accessiblecontrolcontext.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index ac6c9e2dd866..b384af37139c 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -225,14 +225,14 @@ namespace toolkit } - Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const + vcl::Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const { Reference< awt::XControl > xControl( getAccessibleCreator(), UNO_QUERY ); Reference< awt::XWindow > xWindow; if ( xControl.is() ) xWindow.set(xControl->getPeer(), css::uno::UNO_QUERY); - Window* pWindow = xWindow.is() ? VCLUnoHelper::GetWindow( xWindow ) : NULL; + vcl::Window* pWindow = xWindow.is() ? VCLUnoHelper::GetWindow( xWindow ) : NULL; if ( _pxUNOWindow ) *_pxUNOWindow = xWindow; @@ -259,7 +259,7 @@ namespace toolkit // our control Reference< awt::XWindow > xWindow; - Window* pVCLWindow = implGetWindow( &xWindow ); + vcl::Window* pVCLWindow = implGetWindow( &xWindow ); awt::Rectangle aBounds( 0, 0, 0, 0 ); if ( xWindow.is() ) @@ -267,7 +267,7 @@ namespace toolkit // ugly, but .... though the XWindow has a getPosSize, it is impossible to determine the // parent which this position/size is relative to. This means we must tunnel UNO and ask the // implementation - Window* pVCLParent = pVCLWindow ? pVCLWindow->GetParent() : NULL; + vcl::Window* pVCLParent = pVCLWindow ? pVCLWindow->GetParent() : NULL; // the relative location of the window ::Point aWindowRelativePos( 0, 0); @@ -326,7 +326,7 @@ namespace toolkit // want to do some VCL stuff here ... OContextEntryGuard aGuard( this ); - Window* pWindow = implGetWindow( ); + vcl::Window* pWindow = implGetWindow( ); sal_Int32 nColor = 0; if ( pWindow ) { @@ -352,7 +352,7 @@ namespace toolkit // want to do some VCL stuff here ... OContextEntryGuard aGuard( this ); - Window* pWindow = implGetWindow( ); + vcl::Window* pWindow = implGetWindow( ); sal_Int32 nColor = 0; if ( pWindow ) { |