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 /framework/source/uielement/statusbarwrapper.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 'framework/source/uielement/statusbarwrapper.cxx')
| -rw-r--r-- | framework/source/uielement/statusbarwrapper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 980ef49b3460..d9fd8e1cbe46 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -105,7 +105,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) StatusBarManager* pStatusBarManager( 0 ); { SolarMutexGuard aSolarMutexGuard; - Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWindow ) { sal_uLong nStyles = WinBits( WB_LEFT | WB_3DLOOK ); @@ -169,7 +169,7 @@ Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( Ru StatusBarManager* pStatusBarManager = static_cast< StatusBarManager *>( m_xStatusBarManager.get() ); if ( pStatusBarManager ) { - Window* pWindow = (Window *)pStatusBarManager->GetStatusBar(); + vcl::Window* pWindow = (vcl::Window *)pStatusBarManager->GetStatusBar(); if ( pWindow ) return Reference< XInterface >( VCLUnoHelper::GetInterface( pWindow ), UNO_QUERY ); } |