fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

11 files changed, 66 insertions, 66 deletions

diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index b3bab58b0348..49209b65bc0d 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -54,7 +54,7 @@ public:
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
         const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
 
-    virtual void    Edit( Window*, const Link& rEndEditHdl ) SAL_OVERRIDE;
+    virtual void    Edit( vcl::Window*, const Link& rEndEditHdl ) SAL_OVERRIDE;
 
     bool    Refresh( const OUString& rNewFile, const OUString& rNewFilter,
                     const OUString& rNewArea, sal_uLong nNewRefresh );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c30cea833b5d..9c462d7536dc 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -107,7 +107,7 @@ namespace sfx2 {
     class LinkManager;
     }
 class SvxSearchItem;
-class Window;
+namespace vcl { class Window; }
 class XColorList;
 
 struct ScAttrEntry;
@@ -713,7 +713,7 @@ public:
     ScFormulaParserPool& GetFormulaParserPool() const;
 
     bool            HasAreaLinks() const;
-    void            UpdateExternalRefLinks(Window* pWin);
+    void            UpdateExternalRefLinks(vcl::Window* pWin);
     void            UpdateAreaLinks();
 
                     // originating DDE links
@@ -779,7 +779,7 @@ public:
     void            SetChartRangeList( const OUString& rChartName,
                         const ScRangeListRef& rNewRangeListRef );
 
-    void            StartAnimations( SCTAB nTab, Window* pWin );
+    void            StartAnimations( SCTAB nTab, vcl::Window* pWin );
 
     bool            HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ) const;
     bool            HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ) const;
diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx
index 4c43adfe1585..0af5cf896c63 100644
--- a/sc/inc/documentlinkmgr.hxx
+++ b/sc/inc/documentlinkmgr.hxx
@@ -15,7 +15,7 @@
 
 class ScDocument;
 class SfxObjectShell;
-class Window;
+namespace vcl { class Window; }
 
 namespace sfx2 {
 
@@ -54,7 +54,7 @@ public:
 
     bool hasDdeLinks() const;
 
-    bool updateDdeLinks( Window* pWin );
+    bool updateDdeLinks( vcl::Window* pWin );
 
     bool updateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem );
 
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 40096d936aa1..7d917bb626c4 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -190,7 +190,7 @@ public:
     static ScIMapInfo* GetIMapInfo( SdrObject* pObj );
 
     static IMapObject* GetHitIMapObject( SdrObject* pObject,
-                            const Point& rWinPoint, const Window& rCmpWnd );
+                            const Point& rWinPoint, const vcl::Window& rCmpWnd );
 
     static ScMacroInfo* GetMacroInfo( SdrObject* pObj, bool bCreate = false );
 
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index cd5518e92bc6..383186ef715f 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -44,7 +44,7 @@
 
 class ScDocument;
 class ScTokenArray;
-class Window;
+namespace vcl { class Window; }
 class ScFormulaCell;
 
 class ScExternalRefCache;
@@ -70,7 +70,7 @@ public:
     virtual void Closed() SAL_OVERRIDE;
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
         const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue) SAL_OVERRIDE;
-    virtual void Edit(Window* pParent, const Link& rEndEditHdl) SAL_OVERRIDE;
+    virtual void Edit(vcl::Window* pParent, const Link& rEndEditHdl) SAL_OVERRIDE;
 
     void SetDoReferesh(bool b);
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 4d7ada8be307..6e6841b58cdb 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -326,43 +326,43 @@ class ScAbstractDialogFactory
 public:
     SC_DLLPUBLIC static ScAbstractDialogFactory*    Create();
 
-    virtual     AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, const OUString& aDatName,
+    virtual     AbstractScImportAsciiDlg * CreateScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatName,
                                                                     SvStream* pInStream,
                                                                     ScImportAsciiCall eCall) = 0;
 
-    virtual     AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent) = 0;
+    virtual     AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(vcl::Window* pParent) = 0;
 
-    virtual     AbstractScAutoFormatDlg * CreateScAutoFormatDlg(Window* pParent,
+    virtual     AbstractScAutoFormatDlg * CreateScAutoFormatDlg(vcl::Window* pParent,
                                                                 ScAutoFormat* pAutoFormat,
                                                                 const ScAutoFormatData* pSelFormatData,
                                                                 ScViewData *pViewData) = 0;
-    virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent,
+    virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (vcl::Window* pParent,
                                                                 bool bCol = false,
                                                                 bool bRow = false) = 0;
 
-    virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) = 0;
+    virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) = 0;
 
-    virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
+    virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
                                                                 const ScAddress& rPos, int nId ) = 0;
 
-    virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(Window* pParent) = 0;
+    virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) = 0;
 
-    virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg(Window* pParent,
+    virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg(vcl::Window* pParent,
         bool bEnableExternal) = 0;
 
-    virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent,
+    virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( vcl::Window* pParent,
                                                                         const com::sun::star::uno::Sequence<OUString>& rServices,
                                                                         int nId ) = 0;
 
-    virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false) = 0 ;
+    virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false) = 0 ;
 
     //for dataform
-    virtual AbstractScDataFormDlg * CreateScDataFormDlg(Window* pParent,
+    virtual AbstractScDataFormDlg * CreateScDataFormDlg(vcl::Window* pParent,
         ScTabViewShell* pTabViewShell) = 0;
 
-    virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,
+    virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(vcl::Window* pParent,
                                                                     InsertDeleteFlags nCheckDefaults = IDF_NONE) = 0;
-    virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*        pParent,
+    virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( vcl::Window*        pParent,
                                                             ScDocument& rDocument,
                                                             FillDir     eFillDir,
                                                             FillCmd     eFillCmd,
@@ -372,26 +372,26 @@ public:
                                                             double          fMax,
                                                             sal_uInt16          nPossDir) = 0;
 
-    virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent,
+    virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( vcl::Window* pParent,
                                                             bool bUnGroup = false,
                                                             bool bRows    = true ) = 0;
 
-    virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent,
+    virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( vcl::Window* pParent,
                                                              int nId,
                                                              bool bDisallowCellMove = false ) = 0;
 
-    virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window*        pParent,
+    virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window*        pParent,
                                                                     InsertDeleteFlags nCheckDefaults = IDF_NONE,
                                                                     const OUString* pStrTitle = NULL ) = 0;
 
-    virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData,
+    virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData,
         SCTAB nTabCount, bool bFromFile) = 0;
 
-    virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent,
+    virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( vcl::Window* pParent,
                                                           const std::vector<OUString> &rEntryList ) = 0;
-    virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) = 0;
+    virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(vcl::Window* pParent) = 0;
 
-    virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window*        pParent,
+    virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( vcl::Window*        pParent,
                                                                 const OString&  sDialogName,
                                                                 long            nCurrent,
                                                                 long            nDefault,
@@ -402,60 +402,60 @@ public:
                                                                 long            nFirst    = 1,
                                                                 long            nLast     = 100 ) = 0;
 
-    virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(Window * pParent,
+    virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(vcl::Window * pParent,
         const OUString& rDefault) = 0;
 
-    virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent,
+    virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(vcl::Window * pParent,
         sal_uInt16 nFlags) = 0;
 
-    virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) = 0;
+    virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( vcl::Window * pParent, ScDocShell* pShell, bool bInsList=true ) = 0;
 
-    virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(Window* pParent,
+    virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(vcl::Window* pParent,
         const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) = 0;
 
-    virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent,
+    virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( vcl::Window* pParent,
                                                                 const ScDPLabelDataVector& rLabelVec,
                                                                 const ScDPLabelData& rLabelData,
                                                                 const ScPivotFuncData& rFuncData ) = 0;
 
-    virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent,
+    virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( vcl::Window* pParent,
                                                                 ScDPObject& rDPObj,
                                                                 const ScDPLabelData& rLabelData,
                                                                 const ScPivotFuncData& rFuncData,
                                                                 const ScDPNameVec& rDataFields,
                                                                 bool bEnableLayout ) = 0;
 
-    virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( Window* pParent,
+    virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( vcl::Window* pParent,
                                                                 int nId,
                                                                 const ScDPNumGroupInfo& rInfo ) = 0;
 
-    virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( Window* pParent,
+    virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( vcl::Window* pParent,
                                                                 int nId,
                                                                 const ScDPNumGroupInfo& rInfo,
                                                                 sal_Int32 nDatePart,
                                                                 const Date& rNullDate ) = 0;
 
-    virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( Window* pParent, int nId,
+    virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( vcl::Window* pParent, int nId,
                                                                 ScDPObject& rDPObj,
                                                                 sal_uInt16 nOrient ) = 0;
 
-    virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const OUString& rName,
+    virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( vcl::Window* pParent, const OUString& rName,
                                                                 bool bEdit = false, bool bSheetProtected = false ) = 0;
-    virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent) = 0;
+    virtual AbstractScShowTabDlg * CreateScShowTabDlg(vcl::Window* pParent) = 0;
 
-    virtual AbstractScStringInputDlg * CreateScStringInputDlg (  Window* pParent,
+    virtual AbstractScStringInputDlg * CreateScStringInputDlg (  vcl::Window* pParent,
                                                                 const OUString& rTitle,
                                                                 const OUString& rEditTitle,
                                                                 const OUString& rDefault,
                                                                 const OString& sHelpId, const OString& sEditHelpId ) = 0;
 
-    virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg (  Window* pParent,
+    virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg (  vcl::Window* pParent,
                                                                 const OUString& rTitle, //Dialog Title
                                                                 const OUString& rTabBgColorNoColorText, //Label for no tab color
                                                                 const Color& rDefaultColor, //Currently selected Color
                                                                 const OString& ) = 0;
 
-    virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window*                 pParent,
+    virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( vcl::Window*                 pParent,
                                                                     bool                    bAscii = true,
                                                                     const ScImportOptions*  pOptions = NULL,
                                                                     const OUString*         pStrTitle = NULL,
@@ -464,32 +464,32 @@ public:
                                                                     bool                    bImport = true ) = 0;
 
     virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame*    pFrame,
-                                                    Window*          pParent,
+                                                    vcl::Window*          pParent,
                                                     const SfxItemSet* pCellAttrs ) = 0;
 
     virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame*     pFrame,
-                                                    Window*         pParent,
+                                                    vcl::Window*         pParent,
                                                     const SfxItemSet&   rCoreSet,
                                                     const OUString&       rPageStyle,
                                                     sal_uInt16              nResId = RID_SCDLG_HFEDIT ) = 0;
 
-    virtual SfxAbstractTabDialog * CreateScStyleDlg( Window*                pParent,
+    virtual SfxAbstractTabDialog * CreateScStyleDlg( vcl::Window*                pParent,
                                                     SfxStyleSheetBase&  rStyleBase,
                                                     sal_uInt16              nRscId,
                                                     int nId) = 0;
 
-    virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window*             pParent,
+    virtual SfxAbstractTabDialog * CreateScSubTotalDlg( vcl::Window*             pParent,
                                                         const SfxItemSet*   pArgSet ) = 0;
 
-    virtual SfxAbstractTabDialog * CreateScCharDlg(Window* pParent,
+    virtual SfxAbstractTabDialog * CreateScCharDlg(vcl::Window* pParent,
         const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) = 0;
 
-    virtual SfxAbstractTabDialog * CreateScParagraphDlg(Window* pParent,
+    virtual SfxAbstractTabDialog * CreateScParagraphDlg(vcl::Window* pParent,
         const SfxItemSet* pAttr) = 0;
 
-    virtual SfxAbstractTabDialog * CreateScValidationDlg(Window* pParent,
+    virtual SfxAbstractTabDialog * CreateScValidationDlg(vcl::Window* pParent,
         const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) = 0;
-    virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet) = 0;
+    virtual SfxAbstractTabDialog * CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) = 0;
 
     // for tabpage
     virtual CreateTabPage               GetTabPageCreatorFunc( sal_uInt16 nId ) = 0;
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index df6bbfe1a6f2..136f08fbd573 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -111,7 +111,7 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
     bool                mbIsInSharedDocLoading:1;
     bool                mbIsInSharedDocSaving:1;
 
-    std::map<sal_uInt16, std::list<Window*> > m_mapRefWindow;
+    std::map<sal_uInt16, std::list<vcl::Window*> > m_mapRefWindow;
     std::stack<ScAnyRefModalDlg*> maAnyRefDlgStack;
 public:
                     SFX_DECL_INTERFACE(SCID_APP)
@@ -246,16 +246,16 @@ SC_DLLPUBLIC    void                    SetAppOptions   ( const ScAppOptions& rO
     // virtual methods for the 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;
 
     void                SetInSharedDocLoading( bool bNew )  { mbIsInSharedDocLoading = bNew; }
     bool                IsInSharedDocLoading() const        { return mbIsInSharedDocLoading; }
     void                SetInSharedDocSaving( bool bNew )   { mbIsInSharedDocSaving = bNew; }
     bool                IsInSharedDocSaving() const         { return mbIsInSharedDocSaving; }
 
-    SC_DLLPUBLIC bool   RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd );
-    SC_DLLPUBLIC bool   UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd );
-    SC_DLLPUBLIC Window * Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor );
+    SC_DLLPUBLIC bool   RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd );
+    SC_DLLPUBLIC bool   UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd );
+    SC_DLLPUBLIC vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor );
 
     ScAnyRefModalDlg* GetCurrentAnyRefDlg();
     void PushNewAnyRefDlg( ScAnyRefModalDlg* pDlg );
diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index 785fd70a035e..f0b7bf60e2e9 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -13,7 +13,7 @@
 #include "scdllapi.h"
 
 class ScDocument;
-class Window;
+namespace vcl { class Window; }
 
 namespace sc {
 
@@ -58,9 +58,9 @@ public:
 
 class WaitPointerSwitch
 {
-    Window* mpFrameWin;
+    vcl::Window* mpFrameWin;
 public:
-    WaitPointerSwitch(Window* pWin);
+    WaitPointerSwitch(vcl::Window* pWin);
     ~WaitPointerSwitch();
 };
 
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index f4125f38527e..fb85482d3ab2 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -52,7 +52,7 @@ public:
     virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
         const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
 
-    virtual void    Edit( Window*, const Link& rEndEditHdl ) SAL_OVERRIDE;
+    virtual void    Edit( vcl::Window*, const Link& rEndEditHdl ) SAL_OVERRIDE;
 
     bool    Refresh(const OUString& rNewFile, const OUString& rNewFilter,
                     const OUString* pNewOptions /* = NULL */, sal_uLong nNewRefresh );
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 724ea9643a73..4076b2179e0a 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -73,10 +73,10 @@ private:
     OUString aErrorMessage;
 
     bool DoMacro( const ScAddress& rPos, const OUString& rInput,
-                                ScFormulaCell* pCell, Window* pParent ) const;
+                                ScFormulaCell* pCell, vcl::Window* pParent ) const;
 
     bool DoScript( const ScAddress& rPos, const OUString& rInput,
-                                ScFormulaCell* pCell, Window* pParent ) const;
+                                ScFormulaCell* pCell, vcl::Window* pParent ) const;
 
     using ScConditionEntry::operator==;
 
@@ -133,7 +133,7 @@ public:
     bool IsDataValid( ScRefCellValue& rCell, const ScAddress& rPos ) const;
 
                     // TRUE -> break
-    bool DoError( Window* pParent, const OUString& rInput, const ScAddress& rPos ) const;
+    bool DoError( vcl::Window* pParent, const OUString& rInput, const ScAddress& rPos ) const;
     void DoCalcError( ScFormulaCell* pCell ) const;
 
     bool IsEmpty() const;
diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx
index 2f211b3d6cfe..0e7672022809 100644
--- a/sc/inc/waitoff.hxx
+++ b/sc/inc/waitoff.hxx
@@ -22,15 +22,15 @@
 
 #include <sal/types.h>
 
-class Window;
+namespace vcl { class Window; }
 
 class ScWaitCursorOff
 {
 private:
-    Window*                 pWin;
+    vcl::Window*                 pWin;
     sal_uInt32              nWaiters;
 public:
-                        ScWaitCursorOff( Window* pWin );
+                        ScWaitCursorOff( vcl::Window* pWin );
                         ~ScWaitCursorOff();
 };