fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

52 files changed, 163 insertions, 163 deletions

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 2d55e4ed9bc5..a31c25211a50 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -25,7 +25,7 @@
 
 using namespace ::com::sun::star;
 
-CertPathDialog::CertPathDialog(Window* pParent)
+CertPathDialog::CertPathDialog(vcl::Window* pParent)
     : ModalDialog(pParent, "CertDialog", "cui/ui/certdialog.ui")
 {
     get(m_pOKBtn, "ok");
diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx
index aa2128e29738..bdc083c987d8 100644
--- a/cui/source/options/certpath.hxx
+++ b/cui/source/options/certpath.hxx
@@ -33,7 +33,7 @@ private:
     void HandleCheckEntry(SvTreeListEntry* _pEntry);
     void AddCertPath(const OUString &rProfile, const OUString &rPath);
 public:
-    CertPathDialog(Window* pParent);
+    CertPathDialog(vcl::Window* pParent);
     virtual ~CertPathDialog();
 
     OUString getDirectory() const;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 9adf2b546413..dd73fb46be9f 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -45,7 +45,7 @@ namespace offapp
         Link                                    m_aRowChangeHandler;
 
     public:
-        DriverListControl(Window* _pParent);
+        DriverListControl(vcl::Window* _pParent);
 
         virtual void Init() SAL_OVERRIDE;
                 void Update(const DriverPoolingSettings& _rSettings);
@@ -87,7 +87,7 @@ namespace offapp
     };
 
 
-    DriverListControl::DriverListControl(Window* _pParent)
+    DriverListControl::DriverListControl(vcl::Window* _pParent)
         :EditBrowseBox(_pParent, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL | WB_BORDER)
         ,m_aSeekRow(m_aSettings.end())
         ,m_sYes(CUI_RES(RID_SVXSTR_YES))
@@ -98,7 +98,7 @@ namespace offapp
         SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK);
     }
 
-    extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDriverListControl(Window *pParent, VclBuilder::stringmap &)
+    extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDriverListControl(vcl::Window *pParent, VclBuilder::stringmap &)
     {
         return new DriverListControl(pParent);
     }
@@ -300,7 +300,7 @@ namespace offapp
     //= ConnectionPoolOptionsPage
 
 
-    ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet)
+    ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet)
         : SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", &_rAttrSet)
     {
         get(m_pEnablePooling, "connectionpooling");
@@ -326,7 +326,7 @@ namespace offapp
     }
 
 
-    SfxTabPage* ConnectionPoolOptionsPage::Create(Window* _pParent, const SfxItemSet* _rAttrSet)
+    SfxTabPage* ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet)
     {
         return new ConnectionPoolOptionsPage(_pParent, *_rAttrSet);
     }
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index f865438cf50b..868c42702a16 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -48,10 +48,10 @@ namespace offapp
         NumericField*           m_pTimeout;
 
     protected:
-        ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet);
+        ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet);
 
     public:
-        static SfxTabPage*  Create(Window* _pParent, const SfxItemSet* _rAttrSet);
+        static SfxTabPage*  Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet);
 
     protected:
         virtual bool        Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE;
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index eb552d63ef9a..ef45114ddc09 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -47,7 +47,7 @@
 
 // class SvxJSearchOptionsDialog -----------------------------------------
 
-SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(Window *pParent,
+SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent,
     const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags)
     : SfxSingleTabDialog(pParent, rOptionsSet)
     , nInitialTlFlags( nInitialFlags )
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 303a7b570183..0258322d67fe 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -74,7 +74,7 @@ RegistrationItemSetHolder::~RegistrationItemSetHolder()
 
 // class DatabaseRegistrationDialog  ------------------------------------------------
 
-DatabaseRegistrationDialog::DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rInAttrs )
+DatabaseRegistrationDialog::DatabaseRegistrationDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs )
     : RegistrationItemSetHolder(rInAttrs)
     , SfxSingleTabDialog(pParent, getRegistrationItems())
 {
@@ -101,7 +101,7 @@ short DatabaseRegistrationDialog::Execute()
 
 // class DbRegistrationOptionsPage --------------------------------------------------
 
-DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
+DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
 
     SfxTabPage( pParent, "DbRegisterPage", "cui/ui/dbregisterpage.ui", &rSet ),
 
@@ -174,7 +174,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
 
 
 
-SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
+SfxTabPage* DbRegistrationOptionsPage::Create( vcl::Window* pParent,
                                     const SfxItemSet* rAttrSet )
 {
     return ( new DbRegistrationOptionsPage( pParent, *rAttrSet ) );
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index ad1ba1fd97c3..068f361ce61d 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -43,7 +43,7 @@ namespace svx
     //= ODocumentLinkDialog
 
 
-    ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, bool _bCreateNew )
+    ODocumentLinkDialog::ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew )
         : ModalDialog(_pParent, "DatabaseLinkDialog",
             "cui/ui/databaselinkdialog.ui")
         ,m_bCreatingNew(_bCreateNew)
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index d14566902e3c..0584734b761d 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -50,7 +50,7 @@ namespace svx
         Link                    m_aNameValidator;
 
     public:
-        ODocumentLinkDialog( Window* _pParent, bool _bCreateNew );
+        ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew );
 
         // name validation has to be done by an external instance
         // the validator link gets a pointer to a String, and should return 0 if the string is not
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 96014db525ea..4668b48f1508 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -36,7 +36,7 @@
 /*                                                                   */
 /*********************************************************************/
 
-SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
+SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
                                 const SfxItemSet& rSet )
     : SfxTabPage(pParent, "OptFontsPage", "cui/ui/optfontspage.ui", &rSet)
     , pConfig(new SvtFontSubstConfig)
@@ -143,7 +143,7 @@ SvxFontSubstTabPage::~SvxFontSubstTabPage()
     delete m_pCheckLB;
 }
 
-SfxTabPage*  SvxFontSubstTabPage::Create( Window* pParent,
+SfxTabPage*  SvxFontSubstTabPage::Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet)
 {
     return new SvxFontSubstTabPage(pParent, *rAttrSet);
@@ -238,7 +238,7 @@ void  SvxFontSubstTabPage::Reset( const SfxItemSet* )
     m_pFontHeightLB->SaveValue();
 }
 
-IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
+IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
 {
     if (pWin == m_pApply || pWin == m_pDelete)
     {
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 91f87d74e9cd..d73e2b0f9926 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -84,18 +84,18 @@ class SvxFontSubstTabPage : public SfxTabPage
 
     SvLBoxButtonData*   pCheckButtonData;
 
-    DECL_LINK(SelectHdl, Window *pWin = 0);
+    DECL_LINK(SelectHdl, vcl::Window *pWin = 0);
     DECL_LINK(NonPropFontsHdl, CheckBox* pBox);
 
     SvTreeListEntry*    CreateEntry(OUString& rFont1, OUString& rFont2);
     void            CheckEnable();
 
 
-    SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet );
+    SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxFontSubstTabPage();
 
 public:
-    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/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 2baf4f9e6a7d..d16723e130b8 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -56,7 +56,7 @@ struct Prop_Impl
     {}
 };
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCuiCustomMultilineEdit(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCuiCustomMultilineEdit(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new CuiCustomMultilineEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
 }
@@ -124,7 +124,7 @@ Size CuiCustomMultilineEdit::GetOptimalSize() const
     return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
 }
 
-CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent/*, const SfxItemSet& rItemSet*/ ) :
+CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxItemSet& rItemSet*/ ) :
     ModelessDialog( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui"),
     m_pPrefCtrl( get<SvSimpleTableContainer>("preferences") ),
     m_pResetBtn( get<PushButton>("reset") ),
@@ -456,7 +456,7 @@ std::vector< OUString > CuiAboutConfigTabPage::commaStringToSequence( const OUSt
     return tempVector;
 }
 
-CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( Window* pWindow,
+CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( vcl::Window* pWindow,
                                                       const OUString& rValue,
                                                       int limit ) :
     ModalDialog( pWindow, "AboutConfigValueDialog", "cui/ui/aboutconfigvaluedialog.ui" ),
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index e848cc427bff..4714cb2e01e5 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -30,7 +30,7 @@ class CuiCustomMultilineEdit : public Edit
 {
 public:
     bool bNumericOnly;
-    CuiCustomMultilineEdit( Window* pParent, WinBits nStyle )
+    CuiCustomMultilineEdit( vcl::Window* pParent, WinBits nStyle )
         : Edit( pParent, nStyle )
         , bNumericOnly(false)
     {}
@@ -56,7 +56,7 @@ private:
     DECL_LINK( ResetBtnHdl_Impl, void * );
 
 public:
-   CuiAboutConfigTabPage(Window* pParent);
+   CuiAboutConfigTabPage(vcl::Window* pParent);
    void     InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue);
    void     Reset();
    void     FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess);
@@ -70,7 +70,7 @@ private:
     CuiCustomMultilineEdit* m_pEDValue;
 
 public:
-    CuiAboutConfigValueDialog( Window* pWindow, const OUString& rValue , int limit = 0);
+    CuiAboutConfigValueDialog( vcl::Window* pWindow, const OUString& rValue , int limit = 0);
 
     OUString getValue()
     {
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index f63e7aee11b0..ea94d53b95d6 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -31,7 +31,7 @@ struct SvxAccessibilityOptionsTabPage_Impl
             : m_aConfig(){}
 };
 
-SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(Window* pParent,
+SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(vcl::Window* pParent,
     const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptAccessibilityPage",
         "cui/ui/optaccessibilitypage.ui", &rSet)
@@ -61,7 +61,7 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
     delete m_pImpl;
 }
 
-SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxAccessibilityOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new SvxAccessibilityOptionsTabPage(pParent, *rAttrSet);
 }
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index c25316008654..c63c37dac682 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -40,12 +40,12 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage
 
     SvxAccessibilityOptionsTabPage_Impl* m_pImpl;
 
-    SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
+    SvxAccessibilityOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
 public:
 
     virtual ~SvxAccessibilityOptionsTabPage();
 
-    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/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 9877760e70d0..2a2336afd9d1 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -121,7 +121,7 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
 
 static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX;
 
-SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) :
+SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage(pParent, "OptAsianPage", "cui/ui/optasianpage.ui", &rSet),
     pImpl(new SvxAsianLayoutPage_Impl)
 {
@@ -154,7 +154,7 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage()
     delete pImpl;
 }
 
-SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxAsianLayoutPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new SvxAsianLayoutPage(pParent, *rAttrSet);
 }
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 826ac04c4706..db24702e6124 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -25,7 +25,7 @@
 #include <boost/shared_ptr.hpp>
 #include <cuires.hrc>
 
-SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet )
+SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet )
 : SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet)
 {
     SvtMiscOptions aMiscOpt;
@@ -136,7 +136,7 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
     pUseExtendedTypesChk->SaveValue();
 }
 
-SfxTabPage* SvxBasicIDEOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxBasicIDEOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return ( new SvxBasicIDEOptionsPage( pParent, *rAttrSet ) );
 }
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index a843a4eb4925..5b1959d9f5a6 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -37,10 +37,10 @@ private:
     void LoadConfig();
 
 public:
-    SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet );
+    SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxBasicIDEOptionsPage();
 
-    static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
+    static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
     virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void FillUserData() SAL_OVERRIDE;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index ac3d5a2df736..c8bbffd2f621 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -39,7 +39,7 @@ namespace
     }
 }
 
-SvxDefaultColorOptPage::SvxDefaultColorOptPage(Window* pParent, const SfxItemSet& rInAttrs)
+SvxDefaultColorOptPage::SvxDefaultColorOptPage(vcl::Window* pParent, const SfxItemSet& rInAttrs)
     : SfxTabPage(pParent, "OptChartColorsPage","cui/ui/optchartcolorspage.ui", &rInAttrs)
 {
     get(m_pPBRemove, "delete");
@@ -103,7 +103,7 @@ void SvxDefaultColorOptPage::Construct()
 }
 
 
-SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet* rAttrs )
+SfxTabPage* SvxDefaultColorOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs )
 {
     return new SvxDefaultColorOptPage( pParent, *rAttrs );
 }
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 610e29743208..0f210e1ccd15 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -53,12 +53,12 @@ private:
     long GetColorIndex( const Color& rCol );
 
 public:
-    SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs );
+    SvxDefaultColorOptPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
     virtual ~SvxDefaultColorOptPage();
 
     void    Construct();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet* rInAttrs );
+    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
     virtual bool        FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
 };
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 2bf8b38bd8fb..cf749f635df4 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -173,7 +173,7 @@ class ColorConfigWindow_Impl
     , public VclBuilderContainer
 {
 public:
-    ColorConfigWindow_Impl(Window* pParent);
+    ColorConfigWindow_Impl(vcl::Window* pParent);
     virtual ~ColorConfigWindow_Impl();
 
 public:
@@ -196,7 +196,7 @@ private:
         FixedText *m_pText;
     public:
         Chapter(FixedText *pText, bool bShow);
-        Chapter(Window *pGrid, unsigned nYPos, const OUString& sDisplayName);
+        Chapter(vcl::Window *pGrid, unsigned nYPos, const OUString& sDisplayName);
         ~Chapter();
     public:
         void SetBackground(const Wallpaper& W) { m_pText->SetBackground(W); }
@@ -210,7 +210,7 @@ private:
     {
     public:
         Entry(ColorConfigWindow_Impl& rParent, unsigned iEntry, long nCheckBoxLabelOffset, bool bShow);
-        Entry(Window* pGrid, unsigned nYPos, const ExtendedColorConfigValue& aColorEntry,
+        Entry(vcl::Window* pGrid, unsigned nYPos, const ExtendedColorConfigValue& aColorEntry,
             long nCheckBoxLabelOffset);
         ~Entry();
     public:
@@ -238,7 +238,7 @@ private:
         // color list box
         ColorListBox* m_pColorList;
         // color preview box
-        Window* m_pPreview;
+        vcl::Window* m_pPreview;
         // default color
         Color m_aDefaultColor;
     private:
@@ -290,7 +290,7 @@ ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow)
 }
 
 // ctor for extended groups
-ColorConfigWindow_Impl::Chapter::Chapter(Window *pGrid,
+ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid,
     unsigned nYPos, const OUString& rDisplayName)
     : m_bOwnsWidget(true)
 {
@@ -343,7 +343,7 @@ ColorConfigWindow_Impl::Entry::Entry(ColorConfigWindow_Impl& rParent, unsigned i
 }
 
 // ctor for extended entries
-ColorConfigWindow_Impl::Entry::Entry( Window *pGrid, unsigned nYPos,
+ColorConfigWindow_Impl::Entry::Entry( vcl::Window *pGrid, unsigned nYPos,
     ExtendedColorConfigValue const& rColorEntry, long nCheckBoxLabelOffset)
     : m_bOwnsWidgets(true)
     , m_aDefaultColor(rColorEntry.getDefaultColor())
@@ -360,7 +360,7 @@ ColorConfigWindow_Impl::Entry::Entry( Window *pGrid, unsigned nYPos,
     m_pColorList->set_grid_left_attach(1);
     m_pColorList->set_grid_top_attach(nYPos);
 
-    m_pPreview = new Window(pGrid, WB_BORDER);
+    m_pPreview = new vcl::Window(pGrid, WB_BORDER);
     m_pPreview->set_grid_left_attach(2);
     m_pPreview->set_grid_top_attach(nYPos);
     m_pPreview->set_margin_right(6);
@@ -500,7 +500,7 @@ void ColorConfigWindow_Impl::Entry::SetColor (Color aColor)
 // ColorConfigWindow_Impl
 
 
-ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent)
+ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent)
     : VclContainer(pParent)
 {
     m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "cui/ui/colorconfigwin.ui");
@@ -646,9 +646,9 @@ void ColorConfigWindow_Impl::AdjustHeaderBar()
 {
     // horizontal positions
     unsigned const nX0 = 0;
-    unsigned const nX1 = get<Window>("doccolor")->GetPosPixel().X();
-    unsigned const nX2 = get<Window>("doccolor_lb")->GetPosPixel().X();
-    unsigned const nX3 = get<Window>("doccolor_wn")->GetPosPixel().X();
+    unsigned const nX1 = get<vcl::Window>("doccolor")->GetPosPixel().X();
+    unsigned const nX2 = get<vcl::Window>("doccolor_lb")->GetPosPixel().X();
+    unsigned const nX3 = get<vcl::Window>("doccolor_wn")->GetPosPixel().X();
     unsigned const nX4 = m_pHeaderHB->GetSizePixel().Width();
     m_pHeaderHB->SetItemSize(1, nX1 - nX0);
     m_pHeaderHB->SetItemSize(2, nX2 - nX1);
@@ -840,7 +840,7 @@ class ColorConfigCtrl_Impl : public VclVBox
     virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE;
     virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
 public:
-    ColorConfigCtrl_Impl(Window* pParent);
+    ColorConfigCtrl_Impl(vcl::Window* pParent);
     virtual ~ColorConfigCtrl_Impl();
 
     void InitHeaderBar(const OUString &rOn, const OUString &rUIElems,
@@ -859,7 +859,7 @@ public:
     }
 };
 
-ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(Window* pParent)
+ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent)
     : VclVBox(pParent)
     , pColorConfig(0)
     , pExtColorConfig(0)
@@ -916,7 +916,7 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl()
     delete m_pHeaderHB;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorConfigCtrl(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorConfigCtrl(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new ColorConfigCtrl_Impl(pParent);
 }
@@ -1030,7 +1030,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl)
 
 
 SvxColorOptionsTabPage::SvxColorOptionsTabPage(
-    Window* pParent, const SfxItemSet& rCoreSet)
+    vcl::Window* pParent, const SfxItemSet& rCoreSet)
     : SfxTabPage(pParent, "OptAppearancePage", "cui/ui/optappearancepage.ui", &rCoreSet)
     , bFillItemSetCalled(false)
     , pColorConfig(0)
@@ -1043,10 +1043,10 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
     get(m_pColorConfigCT, "colorconfig");
 
     m_pColorConfigCT->InitHeaderBar(
-        get<Window>("on")->GetText(),
-        get<Window>("uielements")->GetText(),
-        get<Window>("colorsetting")->GetText(),
-        get<Window>("preview")->GetText());
+        get<vcl::Window>("on")->GetText(),
+        get<vcl::Window>("uielements")->GetText(),
+        get<vcl::Window>("colorsetting")->GetText(),
+        get<vcl::Window>("preview")->GetText());
 
     m_pColorSchemeLB->SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl));
     Link aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
@@ -1075,7 +1075,7 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
     delete pExtColorConfig;
 }
 
-SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxColorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return ( new SvxColorOptionsTabPage( pParent, *rAttrSet ) );
 }
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index d19c6c628875..509d9f13ab7a 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -47,10 +47,10 @@ class SvxColorOptionsTabPage : public SfxTabPage
     void UpdateColorConfig();
 
 public:
-    SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
+    SvxColorOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxColorOptionsTabPage(  );
 
-    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/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 92ff2a7b81e6..45430195bc94 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -38,7 +38,7 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl)
     return 0;
 }
 
-SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
+SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
 
     SfxTabPage( pParent, "OptCTLPage", "cui/ui/optctlpage.ui", &rSet  )
 
@@ -61,7 +61,7 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage()
 {
 }
 
-SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new SvxCTLOptionsPage( pParent, *rAttrSet );
 }
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index b61cf56bc3c9..3ab62ad2c09d 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -41,13 +41,13 @@ private:
 
     DECL_LINK( SequenceCheckingCB_Hdl, void* );
 
-    SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet );
+    SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
 
 public:
 
     virtual ~SvxCTLOptionsPage();
 
-    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/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index f7ca6510f43f..a214b5952507 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -95,7 +95,7 @@ static CDE_RESULT cmpDicEntry_Impl( const OUString &rText1, const OUString &rTex
 
 // class SvxNewDictionaryDialog -------------------------------------------
 
-SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
+SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent,
         Reference< XSpellChecker1 >  &xSpl ) :
 
     ModalDialog( pParent, "OptNewDictionaryDialog" , "cui/ui/optnewdictionarydialog.ui" ),
@@ -208,7 +208,7 @@ IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog, ModifyHdl_Impl)
 
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window *pParent, VclBuilder::stringmap&)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxDictEdit(vcl::Window *pParent, VclBuilder::stringmap&)
 {
     WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK;
     SvxDictEdit *pEdit = new SvxDictEdit(pParent, nWinStyle);
@@ -216,7 +216,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window *pParent
 };
 
 SvxEditDictionaryDialog::SvxEditDictionaryDialog(
-            Window* pParent,
+            vcl::Window* pParent,
             const OUString& rName,
             Reference< XSpellChecker1 >  &xSpl ) :
 
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 1749c0ae84e0..7170a7cfd926 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -38,7 +38,7 @@ enum MSFltrPg2_CheckBoxEntries {
 
 
 
-OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
+OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", &rSet )
 {
     get( aWBasicCodeCB      , "wo_basic"    );
@@ -70,7 +70,7 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl)
     return 0;
 }
 
-SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
+SfxTabPage* OfaMSFilterTabPage::Create( vcl::Window* pParent,
                                         const SfxItemSet* rAttrSet )
 {
     return new OfaMSFilterTabPage( pParent, *rAttrSet );
@@ -128,7 +128,7 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet* )
     aPBasicStgCB->SaveValue();
 }
 
-OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ) :
+OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage( pParent, "OptFilterPage", "cui/ui/optfltrembedpage.ui", &rSet ),
     sHeader1(CUI_RES(RID_SVXSTR_HEADER1)),
     sHeader2(CUI_RES(RID_SVXSTR_HEADER2)),
@@ -163,7 +163,7 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
     delete m_pCheckLB;
 }
 
-SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
+SfxTabPage* OfaMSFilterTabPage2::Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet )
 {
     return new OfaMSFilterTabPage2( pParent, *rAttrSet );
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 0f4ed12634c1..d5e43d323ec0 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -36,14 +36,14 @@ class OfaMSFilterTabPage : public SfxTabPage
     CheckBox*       aPBasicCodeCB;
     CheckBox*       aPBasicStgCB;
 
-    OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet );
+    OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMSFilterTabPage();
 
     DECL_LINK(LoadWordBasicCheckHdl_Impl, void *);
     DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *);
 public:
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet );
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -83,7 +83,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
            sChgToFromSmartArt;
     SvLBoxButtonData*   pCheckButtonData;
 
-    OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet );
+    OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMSFilterTabPage2();
 
     void                InsertEntry( const OUString& _rTxt, sal_IntPtr _nType );
@@ -93,7 +93,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
 
 public:
 
-    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/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e6d07105012a..f45b4a4dca44 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -183,7 +183,7 @@ namespace
 
 
 
-OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet)
+OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", &rSet)
 {
     get(m_pToolTipsCB, "tooltips");
@@ -236,7 +236,7 @@ OfaMiscTabPage::~OfaMiscTabPage()
 
 
 
-SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new OfaMiscTabPage( pParent, *rAttrSet );
 }
@@ -535,7 +535,7 @@ void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const
 
 // class OfaViewTabPage --------------------------------------------------
 
-OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
+OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", &rSet)
     , nSizeLB_InitialSelection(0)
     , nStyleLB_InitialSelection(0)
@@ -647,7 +647,7 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN )
     return 0;
 }
 
-SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new OfaViewTabPage(pParent, *rAttrSet);
 }
@@ -839,7 +839,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
 
     if(bRepaintWindows)
     {
-        Window* pAppWindow = Application::GetFirstTopLevelWindow();
+        vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow();
 
         while(pAppWindow)
         {
@@ -997,7 +997,7 @@ static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper& rLocal
     return aBuf.makeStringAndClear();
 }
 
-OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) :
+OfaLanguagesTabPage::OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
       SfxTabPage( pParent,"OptLanguagesPage","cui/ui/optlanguagespage.ui", &rSet ),
      pLangConfig(new LanguageConfig_Impl)
 {
@@ -1149,7 +1149,7 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage()
     delete pLangConfig;
 }
 
-SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new OfaLanguagesTabPage(pParent, *rAttrSet);
 }
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 9610eff0e89a..f559a0c00a03 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -65,10 +65,10 @@ protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 
 public:
-    OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet );
+    OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMiscTabPage();
 
-    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;
@@ -120,10 +120,10 @@ private:
     DECL_LINK( OnSelectionToggled, void* );
 
 public:
-    OfaViewTabPage( Window* pParent, const SfxItemSet& rSet );
+    OfaViewTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaViewTabPage();
 
-    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;
@@ -164,10 +164,10 @@ class OfaLanguagesTabPage : public SfxTabPage
     DECL_LINK(  DatePatternsHdl, Edit* ) ;
 
 public:
-    OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet );
+    OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaLanguagesTabPage();
 
-    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/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 20303de88311..1408274a7643 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -209,7 +209,7 @@ public:
 
 
 
-SvxGeneralTabPage::SvxGeneralTabPage(Window* pParent, const SfxItemSet& rCoreSet)
+SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
 
     : SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", &rCoreSet)
 {
@@ -296,7 +296,7 @@ void SvxGeneralTabPage::SetLinks ()
 
 
 
-SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return ( new SvxGeneralTabPage( pParent, *rAttrSet ) );
 }
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 0f3d5125dc03..b95873784cd0 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -42,7 +42,7 @@ const sal_uInt16 aExportToPosArr[] =
 };
 
 
-OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
+OfaHtmlTabPage::OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet) :
 SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet )
 {
     get(aSize1NF,"size1");
@@ -88,7 +88,7 @@ OfaHtmlTabPage::~OfaHtmlTabPage()
 {
 }
 
-SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
+SfxTabPage* OfaHtmlTabPage::Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet )
 {
     return new OfaHtmlTabPage(pParent, *rAttrSet);
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 14052496703f..c79e2393e831 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -52,11 +52,11 @@ class OfaHtmlTabPage : public SfxTabPage
     DECL_LINK(ExportHdl_Impl, ListBox*);
     DECL_LINK(CheckBoxHdl_Impl, CheckBox*);
 
-    OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet);
+    OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
     virtual ~OfaHtmlTabPage();
 public:
 
-    static SfxTabPage*  Create( Window* pParent,
+    static SfxTabPage*  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet );
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 760d1ceb94a6..49e6ff064f51 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -96,7 +96,7 @@ using namespace ::sfx2;
 
 
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNoSpaceEdit(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNoSpaceEdit(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new SvxNoSpaceEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
 }
@@ -152,7 +152,7 @@ bool SvxNoSpaceEdit::set_property(const OString &rKey, const OString &rValue)
 /*                                                                  */
 /********************************************************************/
 
-SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet)
+SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptProxyPage","cui/ui/optproxypage.ui", &rSet)
     , aProxyModePN("ooInetProxyType")
     , aHttpProxyPN("ooInetHTTPProxyName")
@@ -214,7 +214,7 @@ SvxProxyTabPage::~SvxProxyTabPage()
 {
 }
 
-SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new SvxProxyTabPage(pParent, *rAttrSet);
 }
@@ -574,7 +574,7 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
 /*                                                                  */
 /********************************************************************/
 
-SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, const SfxItemSet& rSet)
+SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui", &rSet)
     , mpSecOptions(new SvtSecurityOptions)
     , mpSecOptDlg(NULL)
@@ -853,7 +853,7 @@ void SvxSecurityTabPage::InitControls()
     }
 }
 
-SfxTabPage* SvxSecurityTabPage::Create(Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxSecurityTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new SvxSecurityTabPage(pParent, *rAttrSet);
 }
@@ -1018,7 +1018,7 @@ struct SvxEMailTabPage_Impl
     MailerProgramCfg_Impl aMailConfig;
 };
 
-SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet)
+SvxEMailTabPage::SvxEMailTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage( pParent, "OptEmailPage", "cui/ui/optemailpage.ui", &rSet)
     , pImpl(new SvxEMailTabPage_Impl)
 {
@@ -1039,7 +1039,7 @@ SvxEMailTabPage::~SvxEMailTabPage()
 
 /* -------------------------------------------------------------------------*/
 
-SfxTabPage*  SvxEMailTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage*  SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new SvxEMailTabPage(pParent, *rAttrSet);
 }
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 4182f76efd02..c7d81b756f12 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -43,7 +43,7 @@ class SvxNoSpaceEdit : public Edit
 private:
     bool bOnlyNumeric;
 public:
-    SvxNoSpaceEdit(Window* pParent, WinBits nStyle)
+    SvxNoSpaceEdit(vcl::Window* pParent, WinBits nStyle)
         : Edit(pParent, nStyle)
         , bOnlyNumeric(false)
     {}
@@ -98,11 +98,11 @@ private:
     DECL_LINK( ProxyHdl_Impl, ListBox * );
     DECL_LINK( LoseFocusHdl_Impl, Edit * );
 
-    SvxProxyTabPage( Window* pParent, const SfxItemSet& rSet );
+    SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxProxyTabPage();
 
 public:
-    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;
 };
@@ -111,9 +111,9 @@ public:
 class SvxScriptExecListBox : public ListBox
 { // for adding tooltips to ListBox
 public:
-    SvxScriptExecListBox( Window* pParent, WinBits nStyle = WB_BORDER )
+    SvxScriptExecListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER )
             :ListBox(pParent, nStyle) {}
-    SvxScriptExecListBox( Window* pParent, const ResId& rResId )
+    SvxScriptExecListBox( vcl::Window* pParent, const ResId& rResId )
             :ListBox(pParent, rResId) {}
 
 protected:
@@ -164,7 +164,7 @@ private:
 
     void                InitControls();
 
-                SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet );
+                SvxSecurityTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual     ~SvxSecurityTabPage();
 
 protected:
@@ -172,7 +172,7 @@ protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
 
 public:
-    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;
 };
@@ -192,10 +192,10 @@ class SvxEMailTabPage : public SfxTabPage
     DECL_LINK(  FileDialogHdl_Impl, PushButton* ) ;
 
 public:
-    SvxEMailTabPage( Window* pParent, const SfxItemSet& rSet );
+    SvxEMailTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxEMailTabPage();
 
-    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/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 533bd97e1fca..4f9a7963a5db 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -131,7 +131,7 @@ public:
 
 // class SvxJavaOptionsPage ----------------------------------------------
 
-SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet )
+SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet )
     : SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui", &rSet)
     , m_pParamDlg(NULL)
     , m_pPathDlg(NULL)
@@ -195,7 +195,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
 #if HAVE_FEATURE_JAVA
     jfw_lock();
 #else
-    get<Window>("javaframe")->Disable();
+    get<vcl::Window>("javaframe")->Disable();
 #endif
 }
 
@@ -635,7 +635,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
 
 
 
-SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return ( new SvxJavaOptionsPage( pParent, *rAttrSet ) );
 }
@@ -786,7 +786,7 @@ void SvxJavaOptionsPage::FillUserData()
 
 // class SvxJavaParameterDlg ---------------------------------------------
 
-SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) :
+SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) :
 
     ModalDialog( pParent, "JavaStartParameters",
                  "cui/ui/javastartparametersdialog.ui" )
@@ -919,7 +919,7 @@ void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams )
 
 // class SvxJavaClassPathDlg ---------------------------------------------
 
-SvxJavaClassPathDlg::SvxJavaClassPathDlg(Window* pParent)
+SvxJavaClassPathDlg::SvxJavaClassPathDlg(vcl::Window* pParent)
     : ModalDialog(pParent, "JavaClassPath", "cui/ui/javaclasspathdialog.ui")
 {
     get( m_pPathList, "paths");
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index ab9a9376ceec..353b749f32f5 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -104,10 +104,10 @@ private:
     void                    AddFolder( const OUString& _rFolder );
 
 public:
-    SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet );
+    SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxJavaOptionsPage();
 
-    static SfxTabPage*      Create( Window* pParent, const SfxItemSet* rSet );
+    static SfxTabPage*      Create( vcl::Window* pParent, const SfxItemSet* rSet );
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void            Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -138,7 +138,7 @@ private:
 
 
 public:
-    SvxJavaParameterDlg( Window* pParent );
+    SvxJavaParameterDlg( vcl::Window* pParent );
     virtual ~SvxJavaParameterDlg();
 
     virtual short           Execute() SAL_OVERRIDE;
@@ -170,7 +170,7 @@ private:
                                     m_pPathList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); }
 
 public:
-    SvxJavaClassPathDlg( Window* pParent );
+    SvxJavaClassPathDlg( vcl::Window* pParent );
     virtual ~SvxJavaClassPathDlg();
 
     inline const OUString&  GetOldPath() const { return m_sOldPath; }
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 43f32220590d..96bc0146811f 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -27,7 +27,7 @@ using namespace com::sun::star::i18n;
 
 
 
-SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
+SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage( pParent, "OptJSearchPage", "cui/ui/optjsearchpage.ui", &rSet )
 {
     get( m_pMatchCase, "matchcase");
@@ -61,7 +61,7 @@ SvxJSearchOptionsPage::~SvxJSearchOptionsPage()
 }
 
 
-SfxTabPage*  SvxJSearchOptionsPage::Create( Window* pParent, const SfxItemSet* rSet )
+SfxTabPage*  SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
 {
     return new SvxJSearchOptionsPage( pParent, *rSet );
 }
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 8a8bf0e96110..bb5ac7a4606e 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -24,7 +24,7 @@
 #include <vcl/button.hxx>
 #include <sfx2/tabdlg.hxx>
 
-class Window;
+namespace vcl { class Window; }
 class SfxItemSet;
 
 
@@ -59,12 +59,12 @@ private:
     sal_Int32               GetTransliterationFlags_Impl();
 
 protected:
-                        SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet );
+                        SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
 
 public:
                         virtual ~SvxJSearchOptionsPage();
 
-    static SfxTabPage*  Create( Window* pParent, const SfxItemSet* rSet );
+    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
 
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index bd6edfd16cc3..e59f541c7e46 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -343,7 +343,7 @@ class OptionsBreakSet : public ModalDialog
     NumericField*   m_pBreakNF;
 
 public:
-    OptionsBreakSet(Window* pParent, sal_uInt16 nRID)
+    OptionsBreakSet(vcl::Window* pParent, sal_uInt16 nRID)
         : ModalDialog(pParent, "BreakNumberOption",
             "cui/ui/breaknumberoption.ui")
         , m_pBreakNF(NULL)
@@ -1031,7 +1031,7 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable
 
 // class SvxLinguTabPage -------------------------------------------------
 
-SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) :
+SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage(pParent, "OptLinguPage", "cui/ui/optlingupage.ui", &rSet),
 
     sCapitalWords   (CUI_RES(RID_SVXSTR_CAPITAL_WORDS)),
@@ -1147,7 +1147,7 @@ const sal_uInt16* SvxLinguTabPage::GetRanges()
 
 
 
-SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
+SfxTabPage* SvxLinguTabPage::Create( vcl::Window* pParent,
                                      const SfxItemSet* rAttrSet )
 {
     return ( new SvxLinguTabPage( pParent, *rAttrSet ) );
@@ -1837,7 +1837,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
     }
 }
 
-SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData)
+SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData)
     : ModalDialog( pParent, "EditModulesDialog",
         "cui/ui/editmodulesdialog.ui")
     , sSpell(CUI_RES(RID_SVXSTR_SPELL))
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index bae13c5c5fe6..787cf6f0a7f2 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -111,7 +111,7 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
 
 
 
-OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet)
+OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", &rSet)
 {
     get(m_pUndoEdit, "undo");
@@ -148,7 +148,7 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage()
 
 
 
-SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SfxTabPage* OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new OfaMemoryOptionsPage( pParent, *rAttrSet );
 }
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index b1bf5826a769..b3aaff18715d 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -56,10 +56,10 @@ protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 
 public:
-    OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet );
+    OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMemoryOptionsPage();
 
-    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/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index eb212b30701e..d231aa10542b 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -195,7 +195,7 @@ bool IsMultiPath_Impl( const sal_uInt16 nIndex )
 
 // class SvxPathTabPage --------------------------------------------------
 
-SvxPathTabPage::SvxPathTabPage(Window* pParent, const SfxItemSet& rSet)
+SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     :SfxTabPage( pParent, "OptPathsPage", "cui/ui/optpathspage.ui", &rSet)
     , xDialogListener ( new ::svt::DialogClosedListener() )
 {
@@ -255,7 +255,7 @@ SvxPathTabPage::~SvxPathTabPage()
 
 
 
-SfxTabPage* SvxPathTabPage::Create( Window* pParent,
+SfxTabPage* SvxPathTabPage::Create( vcl::Window* pParent,
                                     const SfxItemSet* rAttrSet )
 {
     return ( new SvxPathTabPage( pParent, *rAttrSet ) );
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index abdcbbd526cc..bb0188866e7a 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -80,7 +80,7 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl()
 
 // class SvxSaveTabPage --------------------------------------------------
 
-SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
+SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) :
     SfxTabPage( pParent, "OptSavePage", "cui/ui/optsavepage.ui", &rCoreSet ),
     pImpl               ( new SvxSaveTabPage_Impl )
 {
@@ -204,7 +204,7 @@ SfxSaveTabPage::~SfxSaveTabPage()
 
 
 
-SfxTabPage* SfxSaveTabPage::Create( Window* pParent,
+SfxTabPage* SfxSaveTabPage::Create( vcl::Window* pParent,
                                     const SfxItemSet* rAttrSet )
 {
     return ( new SfxSaveTabPage( pParent, *rAttrSet ) );
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 97f49b72c310..b5fe40ad204e 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -71,10 +71,10 @@ private:
     void    DetectHiddenControls();
 
 public:
-    SvxSaveTabPage( Window* pParent, const SfxItemSet& rSet );
+    SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxSaveTabPage();
 
-    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/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 6de31e2bb4da..702373b53009 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
 
 // class SvxOnlineUpdateTabPage --------------------------------------------------
 
-SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const SfxItemSet& rSet)
+SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptOnlineUpdatePage", "cui/ui/optonlineupdatepage.ui", &rSet)
 {
     m_aNeverChecked = get<FixedText>("neverchecked")->GetText();
@@ -149,7 +149,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
 
 
 SfxTabPage*
-SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
+SvxOnlineUpdateTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
 {
     return new SvxOnlineUpdateTabPage( pParent, *rAttrSet );
 }
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index a9d397305c74..54bb2a3791f8 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -51,10 +51,10 @@ private:
     void                    UpdateLastCheckedText();
 
 public:
-    SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet );
+    SvxOnlineUpdateTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxOnlineUpdateTabPage();
 
-    static SfxTabPage*      Create( Window* pParent, const SfxItemSet* rSet );
+    static SfxTabPage*      Create( vcl::Window* pParent, const SfxItemSet* rSet );
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void            Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 9500026f4354..5f02689b955c 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::beans;
 
-SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
+SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent )
     : ModalDialog( pParent, "SelectPersonaDialog", "cui/ui/select_persona_dialog.ui" )
 {
     get( m_pSearchButton, "search_personas" );
@@ -258,7 +258,7 @@ void SelectPersonaDialog::ClearSearchResults()
     }
 }
 
-SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet )
+SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet )
     : SfxTabPage( pParent, "PersonalizationTabPage", "cui/ui/personalization_tab.ui", &rSet )
 {
     // persona
@@ -295,7 +295,7 @@ SvxPersonalizationTabPage::~SvxPersonalizationTabPage()
 {
 }
 
-SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet *rSet )
+SfxTabPage* SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
 {
     return new SvxPersonalizationTabPage( pParent, *rSet );
 }
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 4df2a68838b4..95da0717c932 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -40,10 +40,10 @@ private:
 
 public:
     ::rtl::Reference< SearchAndParseThread > m_rApplyThread;
-    SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet );
+    SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet );
     virtual ~SvxPersonalizationTabPage();
 
-    static SfxTabPage* Create( Window *pParent, const SfxItemSet *rSet );
+    static SfxTabPage* Create( vcl::Window *pParent, const SfxItemSet *rSet );
 
     /// Apply the settings ([OK] button).
     virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
@@ -91,7 +91,7 @@ private:
     OUString m_aAppliedPersona;
 
 public:
-    SelectPersonaDialog( Window *pParent );
+    SelectPersonaDialog( vcl::Window *pParent );
     ::rtl::Reference< SearchAndParseThread > m_rSearchThread;
 
     OUString GetSelectedPersona() const;
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index e779aa17a966..b046f218bbb6 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -42,7 +42,7 @@ namespace svx
 {
 
 
-SecurityOptionsDialog::SecurityOptionsDialog(Window* pParent, SvtSecurityOptions* pOptions)
+SecurityOptionsDialog::SecurityOptionsDialog(vcl::Window* pParent, SvtSecurityOptions* pOptions)
     : ModalDialog(pParent, "SecurityOptionsDialog", "cui/ui/securityoptionsdialog.ui")
 {
     DBG_ASSERT( pOptions, "SecurityOptionsDialog::SecurityOptionsDialog(): invalid SvtSecurityOptions" );
diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index 0838e2b39b69..614e3f72dfa3 100644
--- a/cui/source/options/securityoptions.hxx
+++ b/cui/source/options/securityoptions.hxx
@@ -48,7 +48,7 @@ namespace svx
         CheckBox* m_pBlockUntrustedRefererLinksCB;
 
     public:
-        SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions );
+        SecurityOptionsDialog( vcl::Window* pParent, SvtSecurityOptions* pOptions );
         virtual ~SecurityOptionsDialog();
 
         bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked(); }
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index ab9356619845..88900347d401 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -286,8 +286,8 @@ void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< OUString >&
 {
 }
 
-//typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet );
-SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet )
+//typedef SfxTabPage* (*FNCreateTabPage)( vcl::Window *pParent, const SfxItemSet &rAttrSet );
+SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet )
 {
     CreateTabPage fnCreate = 0;
     switch(nId)
@@ -510,7 +510,7 @@ void OfaTreeOptionsDialog::InitWidgets()
 // Ctor() with Frame -----------------------------------------------------
 using namespace ::com::sun::star;
 OfaTreeOptionsDialog::OfaTreeOptionsDialog(
-    Window* pParent,
+    vcl::Window* pParent,
     const Reference< XFrame >& _xFrame,
     bool bActivateLastSelection ) :
 
@@ -529,7 +529,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
 }
 
 // Ctor() with ExtensionId -----------------------------------------------
-OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ) :
+OfaTreeOptionsDialog::OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId ) :
 
     SfxModalDialog( pParent, "OptionsDialog", "cui/ui/optionsdialog.ui" ),
     INI_LIST()
@@ -1131,7 +1131,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
     pNewPage = pPageInfo->m_pPage;
 
     // restore lost focus, if necessary
-    Window* pFocusWin = Application::GetFocusWindow();
+    vcl::Window* pFocusWin = Application::GetFocusWindow();
     // if the focused window is not the options treebox and the old page has the focus
     if ( pFocusWin && pFocusWin != pBox && pOldPage && pOldPage->HasChildPathFocus() )
         // then set the focus to the new page or if we are on a group set the focus to the options treebox
@@ -1142,7 +1142,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
     OString sHelpId(HID_OFADLG_TREELISTBOX);
     if (::isLayoutEnabled(pNewPage))
     {
-        Window *pFirstChild = pNewPage->GetWindow(WINDOW_FIRSTCHILD);
+        vcl::Window *pFirstChild = pNewPage->GetWindow(WINDOW_FIRSTCHILD);
         assert(pFirstChild);
         sHelpId = pFirstChild->GetHelpId();
     }
@@ -2151,7 +2151,7 @@ short OfaTreeOptionsDialog::Execute()
 
 // class ExtensionsTabPage -----------------------------------------------
 ExtensionsTabPage::ExtensionsTabPage(
-    Window* pParent, WinBits nStyle, const OUString& rPageURL,
+    vcl::Window* pParent, WinBits nStyle, const OUString& rPageURL,
     const OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) :
 
     TabPage( pParent, nStyle ),
@@ -2214,7 +2214,7 @@ void ExtensionsTabPage::CreateDialogWithHandler()
                 Reference< awt::XWindowPeer > xWinPeer( xPageControl->getPeer() );
                 if ( xWinPeer.is() )
                 {
-                    Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer );
+                    vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer );
                     if ( pWindow )
                         pWindow->SetStyle( pWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL );
                 }
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 427145a9e659..7d5a483cd647 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -102,7 +102,7 @@ void PasswordTable::setColWidths()
 // class WebConnectionInfoDialog -----------------------------------------
 
 
-WebConnectionInfoDialog::WebConnectionInfoDialog(Window* pParent)
+WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent)
     : ModalDialog(pParent, "StoredWebConnectionDialog", "cui/ui/storedwebconnectiondialog.ui")
     , m_nPos( -1 )
 {
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index 0d8c278cabc4..366bcfc31283 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -62,7 +62,7 @@ namespace svx
     void FillPasswordList();
 
     public:
-        WebConnectionInfoDialog( Window* pParent );
+        WebConnectionInfoDialog( vcl::Window* pParent );
         virtual ~WebConnectionInfoDialog();
     };