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/addonstoolbarwrapper.cxx | |
parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip |
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/addonstoolbarwrapper.cxx')
-rw-r--r-- | framework/source/uielement/addonstoolbarwrapper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 798cb3c96867..77987fa3c279 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -109,7 +109,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument AddonsToolBarManager* pToolBarManager = 0; { SolarMutexGuard aSolarMutexGuard; - Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWindow ) { sal_uLong nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE; @@ -151,7 +151,7 @@ Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw AddonsToolBarManager* pToolBarManager = static_cast< AddonsToolBarManager *>( m_xToolBarManager.get() ); if ( pToolBarManager ) { - Window* pWindow = (Window *)pToolBarManager->GetToolBar(); + vcl::Window* pWindow = (vcl::Window *)pToolBarManager->GetToolBar(); return Reference< XInterface >( VCLUnoHelper::GetInterface( pWindow ), UNO_QUERY ); } } |