fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

15 files changed, 37 insertions, 37 deletions

diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 00355e7a0213..7d292e34ec0d 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -951,7 +951,7 @@ void EditEngine::SetInSelectionMode(bool b)
     pImpEditEngine->bInSelection = b;
 }
 
-bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, Window* pFrameWin )
+bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, vcl::Window* pFrameWin )
 {
     DBG_ASSERT( pEditView, "no View - no cookie !" );
 
diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 861ddb17ef18..1cbc655bb3b1 100644
--- a/editeng/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -82,7 +82,7 @@ void EditSelFunctionSet::DeselectAll()
 
 //  class EditSelectionEngine
 
-EditSelectionEngine::EditSelectionEngine() : SelectionEngine( (Window*)0 )
+EditSelectionEngine::EditSelectionEngine() : SelectionEngine( (vcl::Window*)0 )
 {
     SetSelectionMode( RANGE_SELECTION );
     EnableDrag( true );
@@ -96,7 +96,7 @@ void EditSelectionEngine::SetCurView( EditView* pNewView )
     if ( pNewView )
         SetWindow( pNewView->GetWindow() );
     else
-        SetWindow( (Window*)0 );
+        SetWindow( (vcl::Window*)0 );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index db0444b62ec5..f972ad75cecb 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -151,7 +151,7 @@ LanguageType EditView::CheckLanguage(
 
 // class EditView
 
-EditView::EditView( EditEngine* pEng, Window* pWindow )
+EditView::EditView( EditEngine* pEng, vcl::Window* pWindow )
 {
     pImpEditView = new ImpEditView( this, pEng, pWindow );
 }
@@ -276,13 +276,13 @@ void EditView::SetEditEngine( EditEngine* pEditEng )
     pImpEditView->SetEditSelection( aStartSel );
 }
 
-void EditView::SetWindow( Window* pWin )
+void EditView::SetWindow( vcl::Window* pWin )
 {
     pImpEditView->pOutWin = pWin;
     pImpEditView->pEditEngine->pImpEditEngine->GetSelEngine().Reset();
 }
 
-Window* EditView::GetWindow() const
+vcl::Window* EditView::GetWindow() const
 {
     return pImpEditView->pOutWin;
 }
@@ -355,7 +355,7 @@ void EditView::InsertText( const OUString& rStr, bool bSelect )
     pEE->FormatAndUpdate( this );
 }
 
-bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
+bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin )
 {
     return pImpEditView->PostKeyEvent( rKeyEvent, pFrameWin );
 }
@@ -673,7 +673,7 @@ void EditView::TransliterateText( sal_Int32 nTransliterationMode )
     }
 }
 
-void EditView::CompleteAutoCorrect( Window* pFrameWin )
+void EditView::CompleteAutoCorrect( vcl::Window* pFrameWin )
 {
     if ( !pImpEditView->HasSelection() && pImpEditView->pEditEngine->pImpEditEngine->GetStatus().DoAutoCorrect() )
     {
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 52196a668426..41f754996a61 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::linguistic2;
 
 
-EditSpellWrapper::EditSpellWrapper( Window* _pWin,
+EditSpellWrapper::EditSpellWrapper( vcl::Window* _pWin,
         Reference< XSpellChecker1 >  &xChecker,
         bool bIsStart, bool bIsAllRight, EditView* pView ) :
     SvxSpellWrapper( _pWin, xChecker, bIsStart, bIsAllRight )
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index 797e41b1143e..a3b1382090e3 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -57,7 +57,7 @@ protected:
     virtual void            AutoCorrect( const OUString& rOldWord, const OUString& rNewWord ) SAL_OVERRIDE;
 
 public:
-    EditSpellWrapper( Window* pWin,
+    EditSpellWrapper( vcl::Window* pWin,
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker,
             bool bIsStart,
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index e45abb4213b3..bdd5065ec6a9 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -67,7 +67,7 @@ static inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, shor
 
 //  class ImpEditView
 
-ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) :
+ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindow ) :
     aOutArea( Point(), pEng->GetPaperSize() )
 {
     pEditView           = pView;
@@ -333,7 +333,7 @@ void ImpEditView::ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rD
         }
         else
         {
-            Window* pWindow = dynamic_cast< Window* >(_pTarget);
+            vcl::Window* pWindow = dynamic_cast< vcl::Window* >(_pTarget);
 
             if(pWindow)
             {
@@ -985,7 +985,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck )
     return Pair( nRealDiffX, nRealDiffY );
 }
 
-bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
+bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin )
 {
     bool bDone = false;
 
@@ -1964,7 +1964,7 @@ void ImpEditView::dragOver(const ::com::sun::star::datatransfer::dnd::DropTarget
 
 void ImpEditView::AddDragAndDropListeners()
 {
-    Window* pWindow = GetWindow();
+    vcl::Window* pWindow = GetWindow();
     if ( !bActiveDragAndDropListener && pWindow && pWindow->GetDragGestureRecognizer().is() )
     {
         vcl::unohelper::DragAndDropWrapper* pDnDWrapper = new vcl::unohelper::DragAndDropWrapper( this );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 634aaa0b8b92..b0756c7c73a6 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -79,7 +79,7 @@ class TextRanger;
 class SvKeyValueIterator;
 class SvxForbiddenCharactersTable;
 class SvtCTLOptions;
-class Window;
+namespace vcl { class Window; }
 class SvxNumberFormat;
 
 
@@ -215,7 +215,7 @@ private:
     vcl::Cursor*        pCursor;
     Color*              pBackgroundColor;
     EditEngine*         pEditEngine;
-    Window*             pOutWin;
+    vcl::Window*             pOutWin;
     Pointer*            pPointer;
     DragAndDropInfo*    pDragAndDropInfo;
 
@@ -263,7 +263,7 @@ protected:
     void ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rDocPosTopLeft, const Point& rDocPosBottomRight, PolyPolygon* pPolyPoly );
 
 public:
-                    ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow );
+                    ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindow );
                     virtual ~ImpEditView();
 
     EditView*       GetEditViewPtr() { return pEditView; }
@@ -284,7 +284,7 @@ public:
 
     bool            IsVertical() const;
 
-    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 );
@@ -310,7 +310,7 @@ public:
     void            DrawSelection() { DrawSelection( aEditSelection ); }
     void            DrawSelection( EditSelection, Region* pRegion = NULL, OutputDevice* pTargetDevice = NULL );
 
-    Window*         GetWindow() const           { return pOutWin; }
+    vcl::Window*         GetWindow() const           { return pOutWin; }
 
     EESelectionMode GetSelectionMode() const    { return eSelectionMode; }
     void            SetSelectionMode( EESelectionMode eMode );
@@ -760,7 +760,7 @@ public:
     EditPaM         DeleteSelected( EditSelection aEditSelection);
     EditPaM         InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, bool bIsUserInput = false );
     EditPaM         InsertText(const EditSelection& aCurEditSelection, const OUString& rStr);
-    EditPaM         AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, Window* pFrameWin = NULL );
+    EditPaM         AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, vcl::Window* pFrameWin = NULL );
     EditPaM         DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, sal_uInt8 nDelMode = DELMODE_SIMPLE );
     EditPaM         InsertParaBreak( EditSelection aEditSelection );
     EditPaM         InsertLineBreak(const EditSelection& aEditSelection);
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 63ccd0e36aec..6dd731e2f2f1 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2465,7 +2465,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara )
 }
 
 EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c,
-                                    bool bOverwrite, Window* pFrameWin )
+                                    bool bOverwrite, vcl::Window* pFrameWin )
 {
     EditSelection aSel( rCurSel );
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 92035210ae69..e5230587185e 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star::linguistic2;
 
 
 
-TextConvWrapper::TextConvWrapper( Window* pWindow,
+TextConvWrapper::TextConvWrapper( vcl::Window* pWindow,
         const Reference< XComponentContext >& rxContext,
         const Locale& rSourceLocale,
         const Locale& rTargetLocale,
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index d8073b758925..1dabca5d45b4 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -39,7 +39,7 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
                                       // starts from the cursor position
 
     EditView *      m_pEditView;
-    Window *        m_pWin;
+    vcl::Window *        m_pWin;
 
     bool            m_bStartChk;
     bool            m_bStartDone;
@@ -94,7 +94,7 @@ protected:
 
 
 public:
-    TextConvWrapper( Window* pWindow,
+    TextConvWrapper( vcl::Window* pWindow,
             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/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 506ed316f1e0..ef7e58c7b508 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -69,7 +69,7 @@ namespace editeng
         // general
         AbstractHangulHanjaConversionDialog*
                                 m_pConversionDialog;    // the dialog to display for user interaction
-        Window*                 m_pUIParent;            // the parent window for any UI we raise
+        vcl::Window*                 m_pUIParent;            // the parent window for any UI we raise
         Reference< XComponentContext >
                                 m_xContext;             // the service factory to use
         Reference< XExtendedTextConversion >
@@ -119,7 +119,7 @@ namespace editeng
 
     public:
         HangulHanjaConversion_Impl(
-            Window* _pUIParent,
+            vcl::Window* _pUIParent,
             const Reference< XComponentContext >& rxContext,
             const Locale& _rSourceLocale,
             const Locale& _rTargetLocale,
@@ -229,7 +229,7 @@ namespace editeng
 
     HangulHanjaConversion_Impl::StringMap HangulHanjaConversion_Impl::m_aRecentlyUsedList = HangulHanjaConversion_Impl::StringMap();
 
-    HangulHanjaConversion_Impl::HangulHanjaConversion_Impl( Window* _pUIParent,
+    HangulHanjaConversion_Impl::HangulHanjaConversion_Impl( vcl::Window* _pUIParent,
                                                             const Reference< XComponentContext >& rxContext,
                                                             const Locale& _rSourceLocale,
                                                             const Locale& _rTargetLocale,
@@ -965,7 +965,7 @@ namespace editeng
     bool    HangulHanjaConversion::m_bTryBothDirectionsSave = false;
     HHC::ConversionDirection HangulHanjaConversion::m_ePrimaryConversionDirectionSave   = HHC::eHangulToHanja;
 
-    HangulHanjaConversion::HangulHanjaConversion( Window* _pUIParent,
+    HangulHanjaConversion::HangulHanjaConversion( vcl::Window* _pUIParent,
         const Reference< XComponentContext >& rxContext,
         const Locale& _rSourceLocale, const Locale& _rTargetLocale,
         const vcl::Font* _pTargetFont,
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 35a493335115..68449743ec87 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -143,7 +143,7 @@ SvxSpellWrapper::~SvxSpellWrapper()
  *
  --------------------------------------------------------------------*/
 
-SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
+SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn,
     Reference< XSpellChecker1 >  &xSpellChecker,
     const bool bStart, const bool bIsAllRight,
     const bool bOther, const bool bRevAllow ) :
@@ -168,7 +168,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
 
 
 
-SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
+SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn,
         Reference< XHyphenator >  &xHyphenator,
         const bool bStart, const bool bOther ) :
     pWin        ( pWn ),
@@ -372,7 +372,7 @@ void SvxSpellWrapper::SpellDocument( )
         Reference< XSpellAlternatives >     xAlt( GetLast(), UNO_QUERY );
         Reference< XHyphenatedWord >        xHyphWord( GetLast(), UNO_QUERY );
 
-        Window *pOld = pWin;
+        vcl::Window *pOld = pWin;
         bDialog = true;
         if (xHyphWord.is())
         {
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f22cb42d871f..191bbe833291 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1205,7 +1205,7 @@ OUString SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
 sal_uLong
 SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
                                     sal_Int32 nInsPos, sal_Unicode cChar,
-                                    bool bInsert, Window* pFrameWin )
+                                    bool bInsert, vcl::Window* pFrameWin )
 {
     sal_uLong nRet = 0;
     bool bIsNextRun = bRunNext;
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 4a9da15201ad..2a356199e94b 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -823,7 +823,7 @@ SvxDicListChgClamp::~SvxDicListChgClamp()
     }
 }
 
-short SvxDicError( Window *pParent, sal_Int16 nError )
+short SvxDicError( vcl::Window *pParent, sal_Int16 nError )
 {
     short nRes = 0;
     if (DIC_ERR_NONE != nError)
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 5ca6729b3b83..bbd89edf3538 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
 
 
 
-OutlinerView::OutlinerView( Outliner* pOut, Window* pWin )
+OutlinerView::OutlinerView( Outliner* pOut, vcl::Window* pWin )
 {
 
     pOwner                      = pOut;
@@ -73,7 +73,7 @@ void OutlinerView::Paint( const Rectangle& rRect, OutputDevice* pTargetDevice )
     pEditView->Paint( rRect, pTargetDevice );
 }
 
-bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
+bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin )
 {
     // For the first Paint/KeyInput/Drop an emty Outliner is turned into
     // an Outliner with exactly one paragraph.
@@ -1234,12 +1234,12 @@ void OutlinerView::HideCursor()
     pEditView->HideCursor();
 }
 
-void OutlinerView::SetWindow( Window* pWin )
+void OutlinerView::SetWindow( vcl::Window* pWin )
 {
     pEditView->SetWindow( pWin );
 }
 
-Window* OutlinerView::GetWindow() const
+vcl::Window* OutlinerView::GetWindow() const
 {
     return pEditView->GetWindow();
 }