fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

14 files changed, 79 insertions, 79 deletions

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 3d3cda92c1ff..b7c7f052a9a9 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -57,7 +57,7 @@ namespace sw { namespace sidebarwindows {
 }}
 class SwSidebarItem;
 class SwFrm;
-class Window;
+namespace vcl { class Window; }
 struct ImplSVEvent;
 
 #define SORT_POS    1
@@ -282,10 +282,10 @@ class SwPostItMgr: public SfxListener
             void DisconnectSidebarWinFromFrm( const SwFrm& rFrm,
                                               sw::sidebarwindows::SwSidebarWin& rSidebarWin );
             bool HasFrmConnectedSidebarWins( const SwFrm& rFrm );
-            Window* GetSidebarWinForFrmByIndex( const SwFrm& rFrm,
+            vcl::Window* GetSidebarWinForFrmByIndex( const SwFrm& rFrm,
                                                 const sal_Int32 nIndex );
             void GetAllSidebarWinForFrm( const SwFrm& rFrm,
-                                         std::vector< Window* >* pChildren );
+                                         std::vector< vcl::Window* >* pChildren );
 
             void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage);
 };
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 541772d888dd..3944f1b75654 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -57,7 +57,7 @@ typedef sal_Int64 SwPostItBits;
 
 #define PB_Preview ((SwPostItBits)0x00000001)
 
-class SwSidebarWin : public Window
+class SwSidebarWin : public vcl::Window
 {
     public:
         SwSidebarWin( SwEditWin& rEditWin,
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 6e349b439c41..29dab399a691 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -55,7 +55,7 @@ class SwRect;
 class MapMode;
 class SwAccPreviewData;
 struct PreviewPage;
-class Window;
+namespace vcl { class Window; }
 
 // real states for events
 #define ACC_STATE_EDITABLE 0x01
@@ -193,12 +193,12 @@ public:
     // Dispose frame and its children if bRecursive is set
     void Dispose( const SwFrm* pFrm,
                   const SdrObject* pObj,
-                  Window* pWindow,
+                  vcl::Window* pWindow,
                   bool bRecursive = false );
 
     void InvalidatePosOrSize( const SwFrm* pFrm,
                               const SdrObject* pObj,
-                              Window* pWindow,
+                              vcl::Window* pWindow,
                               const SwRect& rOldFrm );
 
     void InvalidateContent( const SwFrm *pFrm );
@@ -245,7 +245,7 @@ public:
     void InvalidateTextSelectionOfAllParas();
 
     sal_Int32 GetChildIndex( const SwFrm& rParentFrm,
-                             Window& rChild ) const;
+                             vcl::Window& rChild ) const;
 
     // update preview data (and fire events if necessary)
     void UpdatePreview( const std::vector<PreviewPage*>& _rPreviewPages,
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index 4069ebc20a57..448e07efaca6 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -37,7 +37,7 @@ protected:
     DECL_LINK(LoseFocusHdl, void * = 0);
 
 public:
-    SwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc );
+    SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc );
 };
 
 #endif
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 2fd984172ba1..58c6e35f1e14 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -305,9 +305,9 @@ protected:
 
 public:
     TYPEINFO_OVERRIDE();
-    SwCrsrShell( SwDoc& rDoc, Window *pWin, const SwViewOption *pOpt = 0 );
+    SwCrsrShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = 0 );
     // disguised copy constructor
-    SwCrsrShell( SwCrsrShell& rShell, Window *pWin );
+    SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pWin );
     virtual ~SwCrsrShell();
 
     // create new cursor and append the old one
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 37c995ee4ddc..53a801c2090f 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -103,7 +103,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
 
     /// Make DocInfo known to the Doc.
     SAL_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
-                                    Window *pParent, const SfxItemSet &) SAL_OVERRIDE;
+                                    vcl::Window *pParent, const SfxItemSet &) SAL_OVERRIDE;
     /// OLE-stuff
     SAL_DLLPRIVATE virtual void          Draw( OutputDevice*, const JobSetup&, sal_uInt16) SAL_OVERRIDE;
 
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index 5de97850654b..54aa789f18e0 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -43,7 +43,7 @@ public:
     virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV,
                                     const Rectangle *pRect) const SAL_OVERRIDE;
 
-    bool RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt );
+    bool RequestHelp( vcl::Window* pWindow, SdrView* pView, const HelpEvent& rEvt );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE;
 };
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 9aaea8ca7ad6..86ea10ff7464 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -929,10 +929,10 @@ public:
     sal_uInt16 GetScalingOfSelectedText() const;
 
     /// Ctor/Dtor.
-    SwEditShell( SwDoc&, Window*, const SwViewOption *pOpt = 0 );
+    SwEditShell( SwDoc&, vcl::Window*, const SwViewOption *pOpt = 0 );
 
     /// Copy-Constructor in disguise.
-    SwEditShell( SwEditShell&, Window* );
+    SwEditShell( SwEditShell&, vcl::Window* );
     virtual ~SwEditShell();
 
 private:
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 9c2e89d1d9c7..2a10307ea7c7 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -213,8 +213,8 @@ public:
     using SwEditShell::Insert;
 
     TYPEINFO_OVERRIDE();
-    SwFEShell( SwDoc& rDoc, Window *pWin, const SwViewOption *pOpt = 0 );
-    SwFEShell( SwEditShell& rShell, Window *pWin );
+    SwFEShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = 0 );
+    SwFEShell( SwEditShell& rShell, vcl::Window *pWin );
     virtual ~SwFEShell();
 
     /// Copy and Paste methods for internal clipboard.
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index d90d2fe7f7ed..138c72c25427 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -22,7 +22,7 @@
 #include <editeng/hangulhanja.hxx>
 
 class SwView;
-class Window;
+namespace vcl { class Window; }
 class SwWrtShell;
 struct SwConversionArgs;
 class SwPaM;
@@ -30,7 +30,7 @@ class SwPaM;
 class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion
 {
     SwView *    m_pView;
-    Window*     m_pWin;
+    vcl::Window*     m_pWin;
     SwWrtShell &m_rWrtShell;
 
     SwConversionArgs *m_pConvArgs;    /**< object for arguments (and results) needed
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 237aa54def10..daf8ad6246b5 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -41,7 +41,7 @@ class SfxViewFrame;
 class SfxBindings;
 class SfxItemSet;
 class ResId;
-class Window;
+namespace vcl { class Window; }
 class SfxItemPool;
 class SfxStyleSheetBase;
 class SwGlossaryHdl;
@@ -188,7 +188,7 @@ class AbstractSwWordCountFloatDlg : public VclAbstractDialog
 public:
     virtual void        UpdateCounts() = 0;
     virtual void        SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat) = 0;
-    virtual Window *    GetWindow() = 0; //this method is added for return a Window type pointer
+    virtual vcl::Window *    GetWindow() = 0; //this method is added for return a Window type pointer
 };
 
 class AbstractSwInsertAbstractDlg : public VclAbstractDialog
@@ -274,7 +274,7 @@ public:
     virtual void                ReInitDlg() = 0;
     virtual void                ActivateDatabasePage() = 0;
     virtual void                ShowReferencePage() = 0;
-    virtual Window *            GetWindow() = 0; //this method is added for return a Window type pointer
+    virtual vcl::Window *            GetWindow() = 0; //this method is added for return a Window type pointer
 };
 
 class AbstractSwRenameXNamedDlg : public VclAbstractDialog
@@ -296,7 +296,7 @@ class AbstractMarkFloatDlg : public VclAbstractDialog
 {
 public:
     virtual void    ReInitDlg(SwWrtShell& rWrtShell) = 0;
-    virtual Window *    GetWindow() = 0; //this method is added for return a Window type pointer
+    virtual vcl::Window *    GetWindow() = 0; //this method is added for return a Window type pointer
 };
 
 #define RET_LOAD_DOC            100
@@ -323,42 +323,42 @@ class SwAbstractDialogFactory
 public:
     static SwAbstractDialogFactory*     Create();
 
-    virtual SfxAbstractDialog*              CreateSfxDialog( Window* pParent,
+    virtual SfxAbstractDialog*              CreateSfxDialog( vcl::Window* pParent,
                                                                         const SfxItemSet& rAttr,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
                                                                         sal_uInt32 nResId
                                                                         ) = 0;
     virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings,
-        SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo) = 0;
+        SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) = 0;
 
-    virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) = 0;
-    virtual AbstractSwAsciiFilterDlg*  CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
+    virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(vcl::Window* pParent) = 0;
+    virtual AbstractSwAsciiFilterDlg*  CreateSwAsciiFilterDlg ( vcl::Window* pParent, SwDocShell& rDocSh,
                                                                 SvStream* pStream ) = 0;
-    virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;
+    virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;
 
-    virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) = 0;
+    virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0;
     virtual VclAbstractDialog   * CreateSwChangeDBDlg(SwView& rVw) = 0;
-    virtual SfxAbstractTabDialog *  CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
+    virtual SfxAbstractTabDialog *  CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
         sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0;
     virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0;
-    virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0;
+    virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) = 0;
 
     virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView,
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
         com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp,
         const SwDBData& rData) = 0;
-    virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) = 0;
+    virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0;
 
-    virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(Window *pParent, SwWrtShell &rSh,
+    virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(vcl::Window *pParent, SwWrtShell &rSh,
         SwField* pField, bool bNextButton = false) = 0;
-    virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) = 0;
+    virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) = 0;
 
-    virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
+    virtual AbstractSwLabDlg* CreateSwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
                                                      SwDBManager* pDBManager, bool bLabel) = 0;
 
     virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;
 
-    virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent,
+    virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent,
                                                     SwView& rVw,
                                                     const SfxItemSet& rCoreSet,
                                                     sal_uInt8 nDialogMode,
@@ -366,31 +366,31 @@ public:
                                                     bool bDraw = false,
                                                     const OString& sDefPage = OString() ) = 0;
 
-    virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) = 0;
+    virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) = 0;
 
-    virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) = 0;
-    virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) = 0;
+    virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) = 0;
+    virtual AbstractSplitTableDialog * CreateSplitTblDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0;
 
-    virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
+    virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell,
                                                             bool bSetAutoFmt = true,
                                                             const SwTableAutoFmt* pSelFmt = 0 ) = 0;
-    virtual SfxAbstractDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) = 0;
-    virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0;
+    virtual SfxAbstractDialog * CreateSwBorderDlg ( vcl::Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) = 0;
+    virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0;
 
-    virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0;
-    virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
+    virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) = 0;
+    virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool,
         const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0;
 
-    virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) = 0;
+    virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0;
     virtual SfxAbstractDialog*   CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0;
-    virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent,
+    virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0;
-    virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) = 0;
+    virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0;
 
-    virtual VclAbstractDialog*          CreateTblMergeDialog( Window* pParent, bool& rWithPrev ) = 0;
+    virtual VclAbstractDialog*          CreateTblMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0;
     virtual SfxAbstractTabDialog*       CreateFrmTabDialog(const OString &rDialogType,
-                                                SfxViewFrame *pFrame, Window *pParent,
+                                                SfxViewFrame *pFrame, vcl::Window *pParent,
                                                 const SfxItemSet& rCoreSet,
                                                 bool bNewFrm = true,
                                                 bool bFmt = false,
@@ -400,7 +400,7 @@ public:
     /// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
     /// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
     virtual SfxAbstractApplyTabDialog*  CreateTemplateDialog(
-                                                Window*             pParent,
+                                                vcl::Window*             pParent,
                                                 SfxStyleSheetBase&  rBase,
                                                 sal_uInt16          nRegion,
                                                 const OString&      sPage = OString(),
@@ -409,51 +409,51 @@ public:
     virtual AbstractGlossaryDlg*        CreateGlossaryDlg(SfxViewFrame* pViewFrame,
                                                 SwGlossaryHdl* pGlosHdl,
                                                 SwWrtShell *pWrtShell) = 0;
-    virtual AbstractFldInputDlg*        CreateFldInputDlg(Window *pParent,
+    virtual AbstractFldInputDlg*        CreateFldInputDlg(vcl::Window *pParent,
         SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0;
-    virtual AbstractInsFootNoteDlg*     CreateInsFootNoteDlg(Window * pParent,
+    virtual AbstractInsFootNoteDlg*     CreateInsFootNoteDlg(vcl::Window * pParent,
         SwWrtShell &rSh, bool bEd = false) = 0;
-    virtual VclAbstractDialog*          CreateTitlePageDlg ( Window * pParent ) = 0;
+    virtual VclAbstractDialog*          CreateTitlePageDlg ( vcl::Window * pParent ) = 0;
     virtual VclAbstractDialog *         CreateVclSwViewDialog(SwView& rView) = 0;
     virtual AbstractInsTableDlg*        CreateInsTableDlg(SwView& rView) = 0;
-    virtual AbstractJavaEditDialog*     CreateJavaEditDialog(Window* pParent,
+    virtual AbstractJavaEditDialog*     CreateJavaEditDialog(vcl::Window* pParent,
         SwWrtShell* pWrtSh) = 0;
     virtual AbstractMailMergeDlg*       CreateMailMergeDlg( int nResId,
-                                                Window* pParent, SwWrtShell& rSh,
+                                                vcl::Window* pParent, SwWrtShell& rSh,
                                                  const OUString& rSourceName,
                                                 const OUString& rTblName,
                                                 sal_Int32 nCommandType,
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
                                                 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0;
-    virtual AbstractMailMergeCreateFromDlg*     CreateMailMergeCreateFromDlg(Window* pParent) = 0;
-    virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) = 0;
-    virtual VclAbstractDialog*          CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr) = 0;
+    virtual AbstractMailMergeCreateFromDlg*     CreateMailMergeCreateFromDlg(vcl::Window* pParent) = 0;
+    virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) = 0;
+    virtual VclAbstractDialog*          CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) = 0;
     virtual SfxAbstractTabDialog*       CreateSwTabDialog( int nResId,
-                                                Window* pParent,
+                                                vcl::Window* pParent,
                                                 const SfxItemSet* pSwItemSet,
                                                 SwWrtShell &) = 0;
     virtual AbstractMultiTOXTabDialog*      CreateMultiTOXTabDialog(
-                                                Window* pParent, const SfxItemSet& rSet,
+                                                vcl::Window* pParent, const SfxItemSet& rSet,
                                                 SwWrtShell &rShell,
                                                 SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX,
                                                 bool bGlobal = false) = 0;
-    virtual AbstractEditRegionDlg*      CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) = 0;
+    virtual AbstractEditRegionDlg*      CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) = 0;
     virtual AbstractInsertSectionTabDialog*     CreateInsertSectionTabDialog(
-        Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) = 0;
+        vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) = 0;
     virtual AbstractMarkFloatDlg*       CreateIndexMarkFloatDlg(
                                                        SfxBindings* pBindings,
                                                        SfxChildWindow* pChild,
-                                                       Window *pParent,
+                                                       vcl::Window *pParent,
                                                        SfxChildWinInfo* pInfo,
                                                        bool bNew=true) = 0;
     virtual AbstractMarkFloatDlg*       CreateAuthMarkFloatDlg(
                                                        SfxBindings* pBindings,
                                                        SfxChildWindow* pChild,
-                                                       Window *pParent,
+                                                       vcl::Window *pParent,
                                                        SfxChildWinInfo* pInfo,
                                                        bool bNew=true) = 0;
     virtual VclAbstractDialog *         CreateIndexMarkModalDlg(
-                                                Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0;
+                                                vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0;
 
     virtual AbstractMailMergeWizard*    CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) = 0;
 
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index ad7f677f115a..0750261574ac 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -219,7 +219,7 @@ public:
     // Virtual methods for options dialog.
     virtual SfxItemSet*  CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
     virtual void         ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE;
-    virtual SfxTabPage*  CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual SfxTabPage*  CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE;
 
     // Pool is created here and set at SfxShell.
     void    InitAttrPool();
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 98e875e72eda..2833f1104266 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -31,7 +31,7 @@
 #include "authratr.hxx"
 
 class SwRect;
-class Window;
+namespace vcl { class Window; }
 class OutputDevice;
 class SwViewShell;
 class SwDocShell;
@@ -182,7 +182,7 @@ public:
             SwViewOption(const SwViewOption&);
             ~SwViewOption();
 
-    void   Init( Window *pWin );        // Initializing of static data.
+    void   Init( vcl::Window *pWin );        // Initializing of static data.
 
     sal_uInt16 GetPixelTwips() const { return nPixelTwips; }
 
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index f839b359ede1..33dec73e14ea 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -59,7 +59,7 @@ class SwViewOption;
 class SwViewImp;
 class SwPrintData;
 class SwPagePreviewPrtData;
-class Window;
+namespace vcl { class Window; }
 class OutputDevice;
 class SwLayIdle;
 struct ShellResource;
@@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwViewShell : public Ring
 {
     friend void SetOutDev( SwViewShell *pSh, OutputDevice *pOut );
     friend void SetOutDevAndWin( SwViewShell *pSh, OutputDevice *pOut,
-                                 Window *pWin, sal_uInt16 nZoom );
+                                 vcl::Window *pWin, sal_uInt16 nZoom );
 
     friend class SwViewImp;
     friend class SwLayIdle;
@@ -125,7 +125,7 @@ class SW_DLLPUBLIC SwViewShell : public Ring
     SwViewImp    *mpImp;             // Core-internals of SwViewShell.
                                     // The pointer is never 0.
 
-    Window       *mpWin;              ///< = 0 during printing or pdf export
+    ::vcl::Window *mpWin;             ///< = 0 during printing or pdf export
     OutputDevice *mpOut;              ///< Window, Printer, VirtDev, ...
     OutputDevice* mpTmpRef;           // Temporariy reference device. Is used
                                      // during (printer depending) prospect
@@ -184,7 +184,7 @@ class SW_DLLPUBLIC SwViewShell : public Ring
 
 protected:
     static ShellResource*   mpShellRes;      ///< Resources for the Shell.
-    static Window*          mpCareWindow;    ///< Avoid this window.
+    static vcl::Window*          mpCareWindow;    ///< Avoid this window.
 
     SwRect                  maVisArea;       ///< The modern version of VisArea.
     SwDoc                   *mpDoc;          ///< The document; never 0.
@@ -344,10 +344,10 @@ public:
     // 2. GetWin:      Available if we not printing
     // 3. GetOut:      Printer, Window or Virtual device
     OutputDevice& GetRefDev() const;
-    inline Window* GetWin()    const { return mpWin; }
+    inline vcl::Window* GetWin()    const { return mpWin; }
     inline OutputDevice* GetOut()     const { return mpOut; }
 
-    void SetWin(Window* win) { mpWin = win; }
+    void SetWin(vcl::Window* win) { mpWin = win; }
     static inline bool IsLstEndAction() { return SwViewShell::mbLstAct; }
 
     // Change of all page descriptors.
@@ -433,10 +433,10 @@ public:
     static void           SetShellRes( ShellResource* pRes ) { mpShellRes = pRes; }
     static ShellResource* GetShellRes();
 
-    static void           SetCareWin( Window* pNew );
-    static Window*        GetCareWin(SwViewShell& rVSh)
+    static void           SetCareWin( vcl::Window* pNew );
+    static vcl::Window*        GetCareWin(SwViewShell& rVSh)
                           { return mpCareWindow ? mpCareWindow : CareChildWin(rVSh); }
-    static Window*        CareChildWin(SwViewShell& rVSh);
+    static vcl::Window*        CareChildWin(SwViewShell& rVSh);
 
     inline SfxViewShell   *GetSfxViewShell() { return mpSfxViewShell; }
     inline void           SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell = pNew; }
@@ -547,9 +547,9 @@ public:
 
     SwAccessibleMap* GetAccessibleMap();
 
-    SwViewShell( SwViewShell&, Window *pWin = 0, OutputDevice *pOut = 0,
+    SwViewShell( SwViewShell&, vcl::Window *pWin = 0, OutputDevice *pOut = 0,
                 long nFlags = 0 );
-    SwViewShell( SwDoc& rDoc, Window *pWin,
+    SwViewShell( SwDoc& rDoc, vcl::Window *pWin,
                const SwViewOption *pOpt = 0, OutputDevice *pOut = 0,
                long nFlags = 0 );
     virtual ~SwViewShell();