fdo#82577: Handle Window

Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

14 files changed, 33 insertions, 33 deletions

diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 93c5458c21e0..82e7596c422d 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -348,7 +348,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
                     Reference< XWindow > xWindow = xTbxController->createItemWindow( xToolbarWindow );
                     if ( xWindow.is() )
                     {
-                        Window* pItemWin = VCLUnoHelper::GetWindow( xWindow );
+                        vcl::Window* pItemWin = VCLUnoHelper::GetWindow( xWindow );
                         if ( pItemWin )
                         {
                             WindowType nType = pItemWin->GetType();
@@ -477,7 +477,7 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
     for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
     {
         const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
-        Window* pWindow = m_pToolBar->GetItemWindow( nId );
+        vcl::Window* pWindow = m_pToolBar->GetItemWindow( nId );
         if ( pWindow )
         {
             const DataChangedEvent& rDCEvt( *pDataChangedEvent );
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 );
         }
     }
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index ba60e2bd8a19..d80fa5e63fd3 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -53,7 +53,7 @@ namespace framework
 class ComboBoxControl : public ComboBox
 {
     public:
-        ComboBoxControl( Window* pParent, WinBits nStyle, IComboBoxListener* pComboBoxListener );
+        ComboBoxControl( vcl::Window* pParent, WinBits nStyle, IComboBoxListener* pComboBoxListener );
         virtual ~ComboBoxControl();
 
         virtual void Select() SAL_OVERRIDE;
@@ -68,7 +68,7 @@ class ComboBoxControl : public ComboBox
         IComboBoxListener* m_pComboBoxListener;
 };
 
-ComboBoxControl::ComboBoxControl( Window* pParent, WinBits nStyle, IComboBoxListener* pComboBoxListener ) :
+ComboBoxControl::ComboBoxControl( vcl::Window* pParent, WinBits nStyle, IComboBoxListener* pComboBoxListener ) :
     ComboBox( pParent, nStyle )
     , m_pComboBoxListener( pComboBoxListener )
 {
@@ -188,7 +188,7 @@ void ComboboxToolbarController::Select()
 {
     if ( m_pComboBox->GetEntryCount() > 0 )
     {
-        Window::PointerState aState = m_pComboBox->GetPointerState();
+        vcl::Window::PointerState aState = m_pComboBox->GetPointerState();
 
         sal_uInt16 nKeyModifier = sal_uInt16( aState.mnState & KEY_MODTYPE );
         execute( nKeyModifier );
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index bf0ac99eec8f..7e731b306964 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -266,7 +266,7 @@ void ComplexToolbarController::addNotifyInfo(
     }
 }
 
-sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow )
+sal_Int32 ComplexToolbarController::getFontSizePixel( const vcl::Window* pWindow )
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     const vcl::Font&     rFont     = rSettings.GetAppFont();
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index dc64b4a77020..87bc1d53eb56 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -52,7 +52,7 @@ namespace framework
 class ListBoxControl : public ListBox
 {
     public:
-        ListBoxControl( Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener );
+        ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener );
         virtual ~ListBoxControl();
 
         virtual void Select() SAL_OVERRIDE;
@@ -65,7 +65,7 @@ class ListBoxControl : public ListBox
         IListBoxListener* m_pListBoxListener;
 };
 
-ListBoxControl::ListBoxControl( Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener ) :
+ListBoxControl::ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener ) :
     ListBox( pParent, nStyle )
     , m_pListBoxListener( pListBoxListener )
 {
@@ -172,7 +172,7 @@ void DropdownToolbarController::Select()
 {
     if ( m_pListBoxControl->GetEntryCount() > 0 )
     {
-        Window::PointerState aState = m_pListBoxControl->GetPointerState();
+        vcl::Window::PointerState aState = m_pListBoxControl->GetPointerState();
 
         sal_uInt16 nKeyModifier = sal_uInt16( aState.mnState & KEY_MODTYPE );
         execute( nKeyModifier );
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 64d1d196ef16..c38a2a5526b6 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -51,7 +51,7 @@ namespace framework
 class EditControl : public Edit
 {
     public:
-        EditControl( Window* pParent, WinBits nStyle, IEditListener* pEditListener );
+        EditControl( vcl::Window* pParent, WinBits nStyle, IEditListener* pEditListener );
         virtual ~EditControl();
 
         virtual void Modify() SAL_OVERRIDE;
@@ -64,7 +64,7 @@ class EditControl : public Edit
         IEditListener* m_pEditListener;
 };
 
-EditControl::EditControl( Window* pParent, WinBits nStyle, IEditListener* pEditListener ) :
+EditControl::EditControl( vcl::Window* pParent, WinBits nStyle, IEditListener* pEditListener ) :
     Edit( pParent, nStyle )
     , m_pEditListener( pEditListener )
 {
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 48626c1794bd..772a662b9a50 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1026,7 +1026,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
                     xList->getByIndex(i) >>= xFrame;
                     if ( xFrame.is() && nTaskId == nCurItemId )
                     {
-                        Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
+                        vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                         pWin->GrabFocus();
                         pWin->ToTop( TOTOP_RESTOREWHENMIN );
                         break;
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index 011e244d6ec9..8a47769cd667 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -104,7 +104,7 @@ void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range )
     if ( xWindow.is() )
     {
         SolarMutexGuard aSolarMutexGuard;
-        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+        vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
         {
             StatusBar* pStatusBar = (StatusBar *)pWindow;
@@ -142,7 +142,7 @@ void ProgressBarWrapper::end()
     if ( xWindow.is() )
     {
         SolarMutexGuard aSolarMutexGuard;
-        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+        vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
         {
             StatusBar* pStatusBar = (StatusBar *)pWindow;
@@ -172,7 +172,7 @@ void ProgressBarWrapper::setText( const OUString& Text )
     if ( xWindow.is() )
     {
         SolarMutexGuard aSolarMutexGuard;
-        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+        vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
         {
             StatusBar* pStatusBar = (StatusBar *)pWindow;
@@ -225,7 +225,7 @@ void ProgressBarWrapper::setValue( ::sal_Int32 nValue )
     if ( xWindow.is() && bSetValue )
     {
         SolarMutexGuard aSolarMutexGuard;
-        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+        vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
         {
             StatusBar* pStatusBar = (StatusBar *)pWindow;
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index ae4fba5d1095..83557df32f01 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -57,7 +57,7 @@ namespace framework
 class SpinfieldControl : public SpinField
 {
     public:
-        SpinfieldControl( Window* pParent, WinBits nStyle, ISpinfieldListener* pSpinFieldListener );
+        SpinfieldControl( vcl::Window* pParent, WinBits nStyle, ISpinfieldListener* pSpinFieldListener );
         virtual ~SpinfieldControl();
 
         virtual void Up() SAL_OVERRIDE;
@@ -76,7 +76,7 @@ class SpinfieldControl : public SpinField
         ISpinfieldListener* m_pSpinFieldListener;
 };
 
-SpinfieldControl::SpinfieldControl( Window* pParent, WinBits nStyle, ISpinfieldListener* pSpinFieldListener ) :
+SpinfieldControl::SpinfieldControl( vcl::Window* pParent, WinBits nStyle, ISpinfieldListener* pSpinFieldListener ) :
     SpinField( pParent, nStyle )
     , m_pSpinFieldListener( pSpinFieldListener )
 {
diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx
index 03336916a672..75d40a2bdeca 100644
--- a/framework/source/uielement/statusbar.cxx
+++ b/framework/source/uielement/statusbar.cxx
@@ -25,7 +25,7 @@ namespace framework
 {
 
 FrameworkStatusBar::FrameworkStatusBar(
-    Window*           pParent,
+    vcl::Window*           pParent,
     WinBits           nWinBits ) :
     StatusBar( pParent, nWinBits ),
     m_pMgr( NULL )
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 );
         }
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 74d66a4df3aa..8f2de7398760 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -197,7 +197,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
 {
     OSL_ASSERT( m_xContext.is() );
 
-    Window* pWindow = m_pToolBar;
+    vcl::Window* pWindow = m_pToolBar;
     while ( pWindow && !pWindow->IsSystemWindow() )
         pWindow = pWindow->GetParent();
 
@@ -253,7 +253,7 @@ void ToolBarManager::Destroy()
     SolarMutexGuard g;
     if ( m_bAddedToTaskPaneList )
     {
-        Window* pWindow = m_pToolBar;
+        vcl::Window* pWindow = m_pToolBar;
         while ( pWindow && !pWindow->IsSystemWindow() )
             pWindow = pWindow->GetParent();
 
@@ -1042,7 +1042,7 @@ void ToolBarManager::CreateControllers()
                 Reference< XWindow > xWindow = xTbxController->createItemWindow( xToolbarWindow );
                 if ( xWindow.is() )
                 {
-                    Window* pItemWin = VCLUnoHelper::GetWindow( xWindow );
+                    vcl::Window* pItemWin = VCLUnoHelper::GetWindow( xWindow );
                     if ( pItemWin )
                     {
                         WindowType nType = pItemWin->GetType();
@@ -1680,12 +1680,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 
     if ( m_pToolBar->IsCustomize() )
     {
-        sal_uInt16      nPos( 0 );
+        sal_uInt16    nPos( 0 );
         ::PopupMenu*  pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
 
         bool    bIsFloating( false );
 
-        DockingManager* pDockMgr = Window::GetDockingManager();
+        DockingManager* pDockMgr = vcl::Window::GetDockingManager();
         if ( pDockMgr )
             bIsFloating = pDockMgr->IsFloating( m_pToolBar );
 
@@ -2059,7 +2059,7 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
     for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
     {
         const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
-        Window* pWindow = m_pToolBar->GetItemWindow( nId );
+        vcl::Window* pWindow = m_pToolBar->GetItemWindow( nId );
         if ( pWindow )
         {
             const DataChangedEvent& rDCEvt( *pDataChangedEvent );
@@ -2115,7 +2115,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe
             // Use docking window close to close the toolbar. The toolbar layout manager is
             // listener and will react correctly according to the context sensitive
             // flag of our toolbar.
-            Window* pWin = VCLUnoHelper::GetWindow( pExecuteInfo->xWindow );
+            vcl::Window* pWin = VCLUnoHelper::GetWindow( pExecuteInfo->xWindow );
             DockingWindow* pDockWin = dynamic_cast< DockingWindow* >( pWin );
             if ( pDockWin )
                 pDockWin->Close();
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 857519ebdf0f..8a5f5c1fa68a 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -304,7 +304,7 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl
 
                     SolarMutexGuard aGuard;
                     Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
-                    Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+                    vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
                     if ( pWindow )
                         aToolBarInfo.aToolBarUIName = pWindow->GetText();
 
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 );
         }
     }