fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

15 files changed, 31 insertions, 31 deletions

diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 1ac55e03fa52..486200822d9f 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -178,7 +178,7 @@ namespace svt
     }
 
 
-    void OControlAccess::setHelpURL( Window* _pControl, const OUString& sHelpURL, bool _bFileView )
+    void OControlAccess::setHelpURL( vcl::Window* _pControl, const OUString& sHelpURL, bool _bFileView )
     {
         OUString sHelpID( sHelpURL );
         INetURLObject aHID( sHelpURL );
@@ -195,7 +195,7 @@ namespace svt
     }
 
 
-    OUString OControlAccess::getHelpURL( Window* _pControl, bool _bFileView )
+    OUString OControlAccess::getHelpURL( vcl::Window* _pControl, bool _bFileView )
     {
         OString aHelpId = _pControl->GetHelpId();
         if ( _bFileView )
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index 857035e8f15a..3214ebe534b4 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -68,8 +68,8 @@ namespace svt
         OUString             getLabel( sal_Int16 _nId ) const;
         void                        enableControl( sal_Int16 _nId, bool _bEnable );
 
-        static void             setHelpURL( Window* _pControl, const OUString& _rURL, bool _bFileView );
-        static OUString  getHelpURL( Window* _pControl, bool _bFileView );
+        static void             setHelpURL( vcl::Window* _pControl, const OUString& _rURL, bool _bFileView );
+        static OUString  getHelpURL( vcl::Window* _pControl, bool _bFileView );
 
     private:
         /** implements the various methods for setting properties on controls
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 3c83a32942a2..9b442e2792ee 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -463,7 +463,7 @@ sal_Int16 SvtFilePicker::implExecutePicker( )
 }
 
 
-SvtFileDialog* SvtFilePicker::implCreateDialog( Window* _pParent )
+SvtFileDialog* SvtFilePicker::implCreateDialog( vcl::Window* _pParent )
 {
     WinBits nExtraBits;
     WinBits nBits = getWinBits( nExtraBits );
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index b49d7721e4f6..65e4eab4b970 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -205,7 +205,7 @@ protected:
 
     // OCommonPicker overridables
 
-    virtual SvtFileDialog*  implCreateDialog( Window* _pParent ) SAL_OVERRIDE;
+    virtual SvtFileDialog*  implCreateDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
     virtual sal_Int16       implExecutePicker( ) SAL_OVERRIDE;
     virtual bool            implHandleInitializationArgument(
                                 const OUString& _rName,
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 700985011a13..de062ac8e7cc 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -69,7 +69,7 @@ void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< ::com::sun::s
     getDialog()->StartExecuteModal( LINK( this, SvtFolderPicker, DialogClosedHdl ) );
 }
 
-SvtFileDialog* SvtFolderPicker::implCreateDialog( Window* _pParent )
+SvtFileDialog* SvtFolderPicker::implCreateDialog( vcl::Window* _pParent )
 {
     return new SvtFileDialog( _pParent, SFXWB_PATHDIALOG );
 }
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index a285ea0cd727..6261c50f74f0 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -99,7 +99,7 @@ protected:
 
     // OCommonPicker overridables
 
-    virtual SvtFileDialog*  implCreateDialog( Window* _pParent ) SAL_OVERRIDE;
+    virtual SvtFileDialog*  implCreateDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
     virtual sal_Int16       implExecutePicker( ) SAL_OVERRIDE;
 };
 
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 09141b6848fa..4e4bbb363f75 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -53,7 +53,7 @@ void PlacesListBox_Impl::MouseButtonUp( const MouseEvent& rMEvt )
     mpParent->updateView( );
 }
 
-PlacesListBox::PlacesListBox( Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits ) :
+PlacesListBox::PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits ) :
     Control( pParent, nBits ),
     maPlaces( ),
     mpDlg( pFileDlg ),
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index c92b80e8c701..4dd95a414e11 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -48,7 +48,7 @@ class PlacesListBox : public Control
         bool                 mbSelectionChanged;
 
     public:
-        PlacesListBox( Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits );
+        PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits );
         virtual ~PlacesListBox( );
 
         void AppendPlace( PlacePtr pPlace );
diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx
index 9e71b1176d18..49733bbb46a4 100644
--- a/fpicker/source/office/QueryFolderName.hxx
+++ b/fpicker/source/office/QueryFolderName.hxx
@@ -36,7 +36,7 @@ private:
     DECL_LINK( NameHdl, void * );
 
 public:
-    QueryFolderNameDialog(Window* _pParent, const OUString& rTitle,
+    QueryFolderNameDialog(vcl::Window* _pParent, const OUString& rTitle,
         const OUString& rDefaultText, OUString* pGroupName = NULL);
     OUString GetName() const { return m_pNameEdit->GetText(); }
 };
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 004cdaa15c67..a0cb97896b4c 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -35,7 +35,7 @@
 #include <tools/link.hxx>
 
 class SvtFileDialog;
-class Window;
+namespace vcl { class Window; }
 struct ImplSVEvent;
 
 namespace svt
@@ -92,7 +92,7 @@ namespace svt
         // overridables
 
         // will be called with locked SolarMutex
-        virtual SvtFileDialog*  implCreateDialog( Window* _pParent ) = 0;
+        virtual SvtFileDialog*  implCreateDialog( vcl::Window* _pParent ) = 0;
         virtual sal_Int16       implExecutePicker( ) = 0;
             // do NOT override XExecutableDialog::execute! We need to do some stuff there ourself ...
 
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 1d84dc00a241..74b612f40ed1 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -302,7 +302,7 @@ namespace
 
 SvtFileDialog::SvtFileDialog
 (
-    Window* _pParent,
+    vcl::Window* _pParent,
     WinBits nBits,
     WinBits nExtraBits
 ) :
@@ -329,7 +329,7 @@ SvtFileDialog::SvtFileDialog
 
 
 
-SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits )
+SvtFileDialog::SvtFileDialog ( vcl::Window* _pParent, WinBits nBits )
     :ModalDialog( _pParent, "ExplorerFileDialog", "fps/ui/explorerfiledialog.ui" )
     ,_pCbReadOnly( NULL )
     ,_pCbLinkBox( NULL)
@@ -348,14 +348,14 @@ SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits )
     Init_Impl( nBits );
 }
 
-class CustomContainer : public Window
+class CustomContainer : public vcl::Window
 {
     SvtExpFileDlg_Impl* _pImp;
     SvtFileView* _pFileView;
     Splitter* _pSplitter;
 
 public:
-    CustomContainer(Window *pParent)
+    CustomContainer(vcl::Window *pParent)
         : Window(pParent)
         , _pImp(NULL)
         , _pFileView(NULL)
@@ -476,7 +476,7 @@ void SvtFileDialog::Init_Impl
     _pImp->_pLbFilter->setMaxWidthChars(40);
 
     m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) );
-    Window *pUpContainer = get<Window>("up");
+    vcl::Window *pUpContainer = get<vcl::Window>("up");
     _pImp->_pBtnUp = new SvtUpButton_Impl(pUpContainer, this, 0);
     _pImp->_pBtnUp->SetHelpId( HID_FILEOPEN_LEVELUP );
     _pImp->_pBtnUp->set_vexpand(true);
@@ -519,7 +519,7 @@ void SvtFileDialog::Init_Impl
     if ( ( nStyle & SFXWB_MULTISELECTION ) == SFXWB_MULTISELECTION )
         _pImp->_bMultiSelection = true;
 
-    _pContainer = new CustomContainer(get<Window>("container"));
+    _pContainer = new CustomContainer(get<vcl::Window>("container"));
     Size aSize(LogicToPixel(Size(270, 85), MAP_APPFONT));
     _pContainer->set_height_request(aSize.Height());
     _pContainer->set_width_request(aSize.Width());
@@ -1628,10 +1628,10 @@ long SvtFileDialog::OK()
 class SvtDefModalDialogParent_Impl
 {
 private:
-    Window* _pOld;
+    vcl::Window* _pOld;
 
 public:
-    SvtDefModalDialogParent_Impl( Window *pNew ) :
+    SvtDefModalDialogParent_Impl( vcl::Window *pNew ) :
         _pOld( Application::GetDefDialogParent() )
         { Application::SetDefDialogParent( pNew ); }
 
@@ -2832,7 +2832,7 @@ IMPL_LINK_NOARG( SvtFileDialog, Split_Hdl )
     return 0;
 }
 
-QueryFolderNameDialog::QueryFolderNameDialog(Window* _pParent,
+QueryFolderNameDialog::QueryFolderNameDialog(vcl::Window* _pParent,
     const OUString& rTitle, const OUString& rDefaultText, OUString* pGroupName)
     : ModalDialog(_pParent, "FolderNameDialog", "fps/ui/foldernamedialog.ui")
 {
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index c7b38a31796c..c727cfa28c03 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -89,7 +89,7 @@ private:
     CheckBox*                   _pCbPreviewBox;
     CheckBox*                   _pCbSelection;
     PushButton*                 _pPbPlay;
-    Window*                     _pPrevWin;
+    vcl::Window*                     _pPrevWin;
     FixedBitmap*                _pPrevBmp;
     CustomContainer*            _pContainer;
     SvtFileView*                _pFileView;
@@ -193,8 +193,8 @@ protected:
     short                       PrepareExecute();
 
 public:
-                                SvtFileDialog( Window* _pParent, WinBits nBits, WinBits nExtraBits );
-                                SvtFileDialog( Window* _pParent, WinBits nBits );
+                                SvtFileDialog( vcl::Window* _pParent, WinBits nBits, WinBits nExtraBits );
+                                SvtFileDialog( vcl::Window* _pParent, WinBits nBits );
                                 virtual ~SvtFileDialog();
 
     virtual long                OK();
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 48ac401dd885..949ffafede4e 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -91,7 +91,7 @@ SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl()
 
 
 
-SvtFileDialogURLSelector::SvtFileDialogURLSelector( Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId )
+SvtFileDialogURLSelector::SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId )
     :MenuButton ( _pParent, nBits )
     ,m_pDlg     ( _pDlg )
     ,m_pMenu    ( new PopupMenu )
@@ -123,7 +123,7 @@ void SvtFileDialogURLSelector::Activate()
 
 
 
-SvtUpButton_Impl::SvtUpButton_Impl( Window *pParent, SvtFileDialog* pDlg, WinBits nBits )
+SvtUpButton_Impl::SvtUpButton_Impl( vcl::Window *pParent, SvtFileDialog* pDlg, WinBits nBits )
     :SvtFileDialogURLSelector( pParent, pDlg, nBits, IMG_FILEDLG_BTN_UP )
 {
 }
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 9461af970e8e..db2987c401ac 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -90,7 +90,7 @@ protected:
     virtual void    FillURLMenu( PopupMenu* _pMenu ) = 0;
 
 protected:
-    SvtFileDialogURLSelector( Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId );
+    SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId );
     virtual ~SvtFileDialogURLSelector();
 
     virtual void        Activate() SAL_OVERRIDE;
@@ -102,7 +102,7 @@ private:
     std::vector<OUString> _aURLs;
 
 public:
-    SvtUpButton_Impl( Window* pParent, SvtFileDialog* pDlg, WinBits nBits );
+    SvtUpButton_Impl( vcl::Window* pParent, SvtFileDialog* pDlg, WinBits nBits );
     virtual ~SvtUpButton_Impl();
 
 protected:
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index b4127c212cf6..1f4bc6b58e9f 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -90,7 +90,7 @@ SAL_IMPLEMENT_MAIN()
 class MyWin : public WorkWindow
 {
 public:
-                MyWin( Window* pParent, WinBits nWinStyle );
+                MyWin( vcl::Window* pParent, WinBits nWinStyle );
 
     void        MouseMove( const MouseEvent& rMEvt );
     void        MouseButtonDown( const MouseEvent& rMEvt );
@@ -120,7 +120,7 @@ void Main()
 
 
 
-MyWin::MyWin( Window* pParent, WinBits nWinStyle )
+MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle )
     :WorkWindow( pParent, nWinStyle )
     ,aOKBtn(this)
 {