fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

20 files changed, 37 insertions, 37 deletions

diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 08cdc8817235..854d67dbe42f 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -30,7 +30,7 @@
 using namespace ::com::sun::star;
 
 // edit insert-field
-sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS,
+sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &rS,
                               SwField* pField, bool bNextButton)
     : SvxStandardDialog(pParent, "DropdownFieldDialog",
         "modules/swriter/ui/dropdownfielddialog.ui")
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx
index aa4021b2614f..2a0d93f2ec73 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.cxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx
@@ -23,12 +23,12 @@
 #include <vcl/builder.hxx>
 #include <vcl/help.hxx>
 
-SwFldRefTreeListBox::SwFldRefTreeListBox(Window* pParent, WinBits nStyle)
+SwFldRefTreeListBox::SwFldRefTreeListBox(vcl::Window* pParent, WinBits nStyle)
     : SvTreeListBox(pParent, nStyle)
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwFldRefTreeListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwFldRefTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     WinBits nWinStyle = WB_TABSTOP;
     OString sBorder = VclBuilder::extractCustomProperty(rMap);
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx
index 4d92ac11fa05..216d32ae7392 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.hxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx
@@ -27,7 +27,7 @@ protected:
     virtual void    RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
 
 public:
-    SwFldRefTreeListBox(Window* pParent, WinBits nStyle);
+    SwFldRefTreeListBox(vcl::Window* pParent, WinBits nStyle);
 };
 #endif
 
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 2cbde87a6fc6..556b69ada489 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -33,7 +33,7 @@
 #define USER_DATA_VERSION_1     "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
-SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet)
+SwFldDBPage::SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
     : SwFldPage(pParent, "FldDbPage",
         "modules/swriter/ui/flddbpage.ui", rCoreSet)
     , m_nOldFormat(0)
@@ -246,7 +246,7 @@ bool SwFldDBPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-SfxTabPage* SwFldDBPage::Create(    Window* pParent,
+SfxTabPage* SwFldDBPage::Create(    vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
     return ( new SwFldDBPage( pParent, *rAttrSet ) );
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 08a7b0b464e3..6163cb9566d3 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -68,11 +68,11 @@ protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldDBPage(Window* pParent, const SfxItemSet& rSet);
+                        SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
                         virtual ~SwFldDBPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
+    static SfxTabPage*  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 3d6aad2d700a..04d551ffda27 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -47,7 +47,7 @@
 using namespace nsSwDocInfoSubType;
 using namespace com::sun::star;
 
-SwFldDokInfPage::SwFldDokInfPage(Window* pParent, const SfxItemSet& rCoreSet)
+SwFldDokInfPage::SwFldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
     :  SwFldPage(pParent, "FldDocInfoPage",
         "modules/swriter/ui/flddocinfopage.ui", rCoreSet)
     , pSelEntry(0)
@@ -450,7 +450,7 @@ bool SwFldDokInfPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-SfxTabPage* SwFldDokInfPage::Create(    Window* pParent,
+SfxTabPage* SwFldDokInfPage::Create(    vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
     return ( new SwFldDokInfPage( pParent, *rAttrSet ) );
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index c80e25492904..596d3bc2d3b7 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -59,11 +59,11 @@ protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldDokInfPage(Window* pWindow, const SfxItemSet& rSet);
+                        SwFldDokInfPage(vcl::Window* pWindow, const SfxItemSet& rSet);
 
                         virtual ~SwFldDokInfPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
+    static SfxTabPage*  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index d19672b9ef17..f88813a687c0 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -34,7 +34,7 @@
 #define USER_DATA_VERSION_1 "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
-SwFldDokPage::SwFldDokPage(Window* pParent, const SfxItemSet& rCoreSet )
+SwFldDokPage::SwFldDokPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
     : SwFldPage(pParent, "FldDocumentPage",
         "modules/swriter/ui/flddocumentpage.ui", rCoreSet)
     , nOldSel(0)
@@ -632,7 +632,7 @@ bool SwFldDokPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-SfxTabPage* SwFldDokPage::Create(   Window* pParent,
+SfxTabPage* SwFldDokPage::Create(   vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
     return ( new SwFldDokPage( pParent, *rAttrSet ) );
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 702ebdc5b09c..4e8abc27e2b0 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -61,11 +61,11 @@ protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldDokPage(Window* pWindow, const SfxItemSet& rSet);
+                        SwFldDokPage(vcl::Window* pWindow, const SfxItemSet& rSet);
 
                         virtual ~SwFldDokPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
+    static SfxTabPage*  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index a663eba68771..b96eb21b582a 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -37,7 +37,7 @@
 
 using namespace ::com::sun::star;
 
-SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet)
+SwFldFuncPage::SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
     : SwFldPage(pParent, "FldFuncPage",
         "modules/swriter/ui/fldfuncpage.ui", rCoreSet)
     , nOldFormat(0)
@@ -499,7 +499,7 @@ void SwFldFuncPage::UpdateSubType()
 // call MacroBrowser, fill Listbox with Macros
 IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn )
 {
-    Window* pDefModalDlgParent = Application::GetDefDialogParent();
+    vcl::Window* pDefModalDlgParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( pBtn );
     const OUString sMacro(TurnMacroString(m_pNameED->GetText()).replaceAll(".", ";"));
     if (GetFldMgr().ChooseMacro(sMacro))
@@ -597,7 +597,7 @@ OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro)
     return rMacro;
 }
 
-SfxTabPage* SwFldFuncPage::Create(  Window* pParent,
+SfxTabPage* SwFldFuncPage::Create(  vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
     return ( new SwFldFuncPage( pParent, *rAttrSet ) );
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 06140a23f7e5..fb8cfa906969 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -83,11 +83,11 @@ protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldFuncPage(Window* pParent, const SfxItemSet& rSet);
+                        SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
                         virtual ~SwFldFuncPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
+    static SfxTabPage*  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index cd21a1275f2e..c5b2d204a083 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -41,7 +41,7 @@
 
 using namespace ::com::sun::star;
 
-SwFldPage::SwFldPage(Window *pParent, const OString& rID,
+SwFldPage::SwFldPage(vcl::Window *pParent, const OString& rID,
     const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet)
     : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet)
     , m_pCurFld(0)
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index dedbae5fcf2f..3416e97361ac 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -77,7 +77,7 @@ protected:
     using SfxTabPage::ActivatePage;
 
 public:
-    SwFldPage(Window *pParent, const OString& rID,
+    SwFldPage(vcl::Window *pParent, const OString& rID,
         const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet);
 
     virtual ~SwFldPage();
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index f9f3fb479a62..704899267032 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -47,7 +47,7 @@ static sal_uInt16 nFldDlgFmtSel = 0;
 #define USER_DATA_VERSION_1 "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
-SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet )
+SwFldRefPage::SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
     : SwFldPage(pParent, "FldRefPage",
         "modules/swriter/ui/fldrefpage.ui", rCoreSet)
     , maOutlineNodes()
@@ -937,7 +937,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-SfxTabPage* SwFldRefPage::Create(   Window* pParent,
+SfxTabPage* SwFldRefPage::Create(   vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
     return ( new SwFldRefPage( pParent, *rAttrSet ) );
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 93f8c75beb0d..27e5ab4fb22e 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -74,11 +74,11 @@ protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldRefPage(Window* pParent, const SfxItemSet& rSet);
+                        SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
                         virtual ~SwFldRefPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
+    static SfxTabPage*  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 536f0fee99bb..11b528b4f1f5 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
 // carrier of the dialog
-SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent)
+SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent)
     : SfxTabDialog(pParent, "FieldDialog", "modules/swriter/ui/fielddialog.ui")
     , m_pChildWin(pCW)
     , m_pBindings(pB)
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 7205cc6ab317..3581bc3d8b80 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -38,7 +38,7 @@
 #define USER_DATA_VERSION_1 "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
-SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet )
+SwFldVarPage::SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rCoreSet )
     : SwFldPage(pParent, "FldVarPage",
         "modules/swriter/ui/fldvarpage.ui", rCoreSet)
     , nOldFormat(0)
@@ -1225,7 +1225,7 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-SfxTabPage* SwFldVarPage::Create(   Window* pParent,
+SfxTabPage* SwFldVarPage::Create(   vcl::Window* pParent,
                         const SfxItemSet* rAttrSet )
 {
     return ( new SwFldVarPage( pParent, *rAttrSet ) );
@@ -1236,13 +1236,13 @@ sal_uInt16 SwFldVarPage::GetGroup()
     return GRP_VAR;
 }
 
-SelectionListBox::SelectionListBox(Window* pParent, WinBits nStyle)
+SelectionListBox::SelectionListBox(vcl::Window* pParent, WinBits nStyle)
     : ListBox(pParent, nStyle)
     , bCallAddSelection(false)
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSelectionListBox(Window *pParent, VclBuilder::stringmap &rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSelectionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
 {
     WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK;
 
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 98ebece0702e..9d1a37f0a5a9 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -40,7 +40,7 @@ class SelectionListBox : public ListBox
     virtual bool    PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
 public:
-    SelectionListBox(Window* pParent, WinBits nStyle);
+    SelectionListBox(vcl::Window* pParent, WinBits nStyle);
 
     //  detect selection via Ctrl or Alt and evaluate with SelectHdl
     bool            IsCallAddSelection() const {return bCallAddSelection;}
@@ -90,11 +90,11 @@ protected:
     virtual sal_uInt16      GetGroup() SAL_OVERRIDE;
 
 public:
-                        SwFldVarPage(Window* pParent, const SfxItemSet& rSet);
+                        SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
                         virtual ~SwFldVarPage();
 
-    static SfxTabPage*  Create(Window* pParent, const SfxItemSet* rAttrSet);
+    static SfxTabPage*  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index df9f54a66968..40d04832896b 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -31,7 +31,7 @@
 #include <fldui.hrc>
 
 // edit field-insert
-SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
+SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
                               SwField* pField, bool bNextButton )
     : SvxStandardDialog( pParent, "InputFieldDialog",
         "modules/swriter/ui/inputfielddialog.ui")
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 5a2c8891a7fb..b3c1bae39a4d 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -38,7 +38,7 @@
 
 using namespace ::com::sun::star;
 
-SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) :
+SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) :
     SvxStandardDialog(pParent, "InsertScriptDialog", "modules/swriter/ui/insertscript.ui"),
 
     bNew(true),