fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

8 files changed, 29 insertions, 29 deletions

diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 715d519ec2ae..e10b7a1b826c 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -83,7 +83,7 @@ class Rectangle;
 class SvStream;
 class Link;
 class OutputDevice;
-class Window;
+namespace vcl { class Window; }
 class SfxPoolItem;
 class SvxNumBulletItem;
 class SvxBulletItem;
@@ -142,7 +142,7 @@ private:
 
     EDITENG_DLLPRIVATE                 EditEngine( const EditEngine& );
     EDITENG_DLLPRIVATE EditEngine&     operator=( const EditEngine& );
-    EDITENG_DLLPRIVATE bool            PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL );
+    EDITENG_DLLPRIVATE bool            PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, vcl::Window* pFrameWin = NULL );
 
     EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode);
     EDITENG_DLLPRIVATE void CheckIdleFormatter();
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 62c37d942cca..176de82f65e5 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -33,7 +33,7 @@ class ImpEditEngine;
 class ImpEditView;
 class SvxSearchItem;
 class SvxFieldItem;
-class Window;
+namespace vcl { class Window; }
 class Pointer;
 class KeyEvent;
 class MouseEvent;
@@ -85,14 +85,14 @@ private:
     EDITENG_DLLPRIVATE EditView&        operator=( const EditView& );
 
 public:
-                    EditView( EditEngine* pEng, Window* pWindow );
+                    EditView( EditEngine* pEng, vcl::Window* pWindow );
     virtual         ~EditView();
 
     void            SetEditEngine( EditEngine* pEditEngine );
     EditEngine*     GetEditEngine() const;
 
-    void            SetWindow( Window* pWin );
-    Window*         GetWindow() const;
+    void            SetWindow( vcl::Window* pWin );
+    vcl::Window*         GetWindow() const;
 
     void            Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 );
     void            Invalidate();
@@ -136,7 +136,7 @@ public:
 
     void            InsertText( const OUString& rNew, bool bSelect = false );
 
-    bool            PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
+    bool            PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = NULL );
 
     bool            MouseButtonUp( const MouseEvent& rMouseEvent );
     bool            MouseButtonDown( const MouseEvent& rMouseEvent );
@@ -187,7 +187,7 @@ public:
     void            SetAnchorMode( EVAnchorMode eMode );
     EVAnchorMode    GetAnchorMode() const;
 
-    void            CompleteAutoCorrect( Window* pFrameWin = NULL );
+    void            CompleteAutoCorrect( vcl::Window* pFrameWin = NULL );
 
     EESpellState    StartSpeller( bool bMultipleDoc = false );
     EESpellState    StartThesaurus();
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 6a2567909330..a767061454cb 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2
     class XHyphenator;
 } } } }
 
-class Window;
+namespace vcl { class Window; }
 class ResId;
 class Link;
 class SvxSpellWrapper;
@@ -42,7 +42,7 @@ class AbstractThesaurusDialog : public VclAbstractDialog
 public:
     virtual OUString    GetWord() = 0;
     virtual sal_uInt16  GetLanguage() const = 0;
-    virtual Window*     GetWindow() = 0;
+    virtual vcl::Window*     GetWindow() = 0;
 };
 
 class AbstractHyphenWordDialog : public VclAbstractDialog
@@ -50,7 +50,7 @@ class AbstractHyphenWordDialog : public VclAbstractDialog
 public:
     virtual void    SelLeft() = 0;
     virtual void    SelRight() = 0;
-    virtual Window* GetWindow() = 0;
+    virtual vcl::Window* GetWindow() = 0;
 };
 
 class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog
@@ -87,14 +87,14 @@ class EDITENG_DLLPUBLIC EditAbstractDialogFactory : virtual public VclAbstractDi
 public:
                                         virtual ~EditAbstractDialogFactory();   // needed for export of vtable
     static EditAbstractDialogFactory*   Create();
-    virtual AbstractThesaurusDialog*        CreateThesaurusDialog( Window*, css::uno::Reference< css::linguistic2::XThesaurus >  xThesaurus,
+    virtual AbstractThesaurusDialog*        CreateThesaurusDialog( vcl::Window*, css::uno::Reference< css::linguistic2::XThesaurus >  xThesaurus,
                                                 const OUString &rWord, sal_Int16 nLanguage ) = 0;
 
-    virtual AbstractHyphenWordDialog*       CreateHyphenWordDialog( Window*,
+    virtual AbstractHyphenWordDialog*       CreateHyphenWordDialog( vcl::Window*,
                                                 const OUString &rWord, LanguageType nLang,
                                                 css::uno::Reference< css::linguistic2::XHyphenator >  &xHyphen,
                                                 SvxSpellWrapper* pWrapper ) = 0;
-    virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,
+    virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( vcl::Window* _pParent,
                                             editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0;
 };
 
diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index 178e6be93cd8..08f8b4e21ebc 100644
--- a/include/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
@@ -110,7 +110,7 @@ namespace editeng
 
     public:
         HangulHanjaConversion(
-            Window* _pUIParent,
+            vcl::Window* _pUIParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
             const ::com::sun::star::lang::Locale& _rSourceLocale,
             const ::com::sun::star::lang::Locale& _rTargetLocale,
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 18ac8316d799..5a020c147830 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -49,7 +49,7 @@ class SvxBulletItem;
 class SvxFont;
 class SvxSearchItem;
 class SvxFieldItem;
-class Window;
+namespace vcl { class Window; }
 class KeyEvent;
 class MouseEvent;
 class Pointer;
@@ -203,7 +203,7 @@ private:
     EDITENG_DLLPRIVATE sal_Int32    ImpCalcSelectedPages( bool bIncludeFirstSelected );
 
 public:
-                OutlinerView( Outliner* pOut, Window* pWindow );
+                OutlinerView( Outliner* pOut, vcl::Window* pWindow );
     virtual     ~OutlinerView();
 
     EditView&   GetEditView() const { return *pEditView; }
@@ -211,7 +211,7 @@ public:
     void        Scroll( long nHorzScroll, long nVertScroll );
 
     void        Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 );
-    bool        PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL );
+    bool        PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin = NULL );
     bool        MouseButtonDown( const MouseEvent& );
     bool        MouseButtonUp( const MouseEvent& );
     bool        MouseMove( const MouseEvent& );
@@ -221,8 +221,8 @@ public:
 
     Outliner*   GetOutliner() const { return pOwner; }
 
-    void        SetWindow( Window* pWindow );
-    Window*     GetWindow() const;
+    void        SetWindow( vcl::Window* pWindow );
+    vcl::Window*     GetWindow() const;
 
     void        SetReadOnly( bool bReadOnly );
     bool        IsReadOnly() const;
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 0039f440d101..2763be8ecaae 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 {
     class XHyphenator;
 }}}}
 
-class Window;
+namespace vcl { class Window; }
 class SdrObject;
 // misc functions ---------------------------------------------------------------
 
@@ -48,7 +48,7 @@ private:
     friend class SvxHyphenWordDialog;
     friend struct SvxHyphenWordDialog_Impl;
 
-    Window*     pWin;
+    vcl::Window*     pWin;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::uno::XInterface >             xLast;  // result of last spelling/hyphenation attempt
     ::com::sun::star::uno::Reference<
@@ -72,12 +72,12 @@ private:
     bool    FindSpellError();   // Check for errors (over areas)
 
 public:
-    SvxSpellWrapper( Window* pWn,
+    SvxSpellWrapper( vcl::Window* pWn,
                      ::com::sun::star::uno::Reference<
                          ::com::sun::star::linguistic2::XSpellChecker1 >  &xSpellChecker,
                      const bool bStart = false, const bool bIsAllRight = false,
                      const bool bOther = false, const bool bRevAllow = true );
-    SvxSpellWrapper( Window* pWn,
+    SvxSpellWrapper( vcl::Window* pWn,
                      ::com::sun::star::uno::Reference<
                          ::com::sun::star::linguistic2::XHyphenator >  &xHyphenator,
                      const bool bStart = false, const bool bOther = false );
@@ -109,7 +109,7 @@ public:
         ::com::sun::star::linguistic2::XHyphenator >
                     GetXHyphenator()    { return xHyph; }
     inline bool     IsAllRight()        { return bAllRight; }
-    inline Window*  GetWin() { return pWin; }
+    inline vcl::Window*  GetWin() { return pWin; }
     inline void     EnableAutoCorrect() { bAuto = true; }
 
 protected:
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 9564de3b6ef3..aff3c036f4e3 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -40,7 +40,7 @@ class CharClass;
 class SfxPoolItem;
 class SvxAutoCorrect;
 class SfxObjectShell;
-class Window;
+namespace vcl { class Window; }
 
 struct CompareSvStringsISortDtor
 {
@@ -291,7 +291,7 @@ public:
     // to the actual SwTxtNode/EditNode string because it inserts the character
     // in rDoc and expects that to side-effect rTxt
     sal_uLong DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
-                           sal_Int32 nPos, sal_Unicode cInsChar, bool bInsert, Window* pFrameWin = NULL );
+                           sal_Int32 nPos, sal_Unicode cInsChar, bool bInsert, vcl::Window* pFrameWin = NULL );
 
     // Return for the autotext expansion the previous word,
     // AutoCorrect - corresponding algorithm
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index 8ed168f50c72..72d1567e7b9e 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -34,7 +34,7 @@
 
 class LinguMgrExitLstnr;
 
-class Window;
+namespace vcl { class Window; }
 
 
 
@@ -183,7 +183,7 @@ EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference<
 // misc functions
 
 
-EDITENG_DLLPUBLIC short SvxDicError( Window *pParent, sal_Int16 nError );
+EDITENG_DLLPUBLIC short SvxDicError( vcl::Window *pParent, sal_Int16 nError );
 
 
 #endif