From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Sep 2014 11:20:40 +0200 Subject: fdo#82577: Handle Window Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a --- framework/source/uielement/toolbarwrapper.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'framework/source/uielement/toolbarwrapper.cxx') diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 1c3ec89aac89..ad609a20cca8 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -145,7 +145,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th ToolBarManager* 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; @@ -259,7 +259,7 @@ Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::c ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>( 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 ); } } -- cgit