fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

9 files changed, 34 insertions, 34 deletions

diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 61ce2c161842..b36cf4058a50 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -44,7 +44,7 @@ protected:
 
 
 public:
-                    EditBox( Window* pParent, WinBits nBits );
+                    EditBox( vcl::Window* pParent, WinBits nBits );
 
                     virtual ~EditBox();
 
@@ -62,7 +62,7 @@ public:
 class ArgEdit : public RefEdit
 {
 public:
-            ArgEdit( Window* pParent, WinBits nBits );
+            ArgEdit( vcl::Window* pParent, WinBits nBits );
 
     void    Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
                   ScrollBar& rArgSlider, sal_uInt16 nArgCount );
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 25dde889fd67..c8489ceb7abf 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -391,13 +391,13 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
     sal_uInt16 nSwitch=rNEvt.GetType();
     if(nSwitch==EVENT_GETFOCUS && !bIsShutDown)
     {
-        Window* pWin=rNEvt.GetWindow();
+        vcl::Window* pWin=rNEvt.GetWindow();
         if(pWin!=NULL)
         {
             aActivWinId = pWin->GetUniqueId();
             if(aActivWinId.isEmpty())
             {
-                Window* pParent=pWin->GetParent();
+                vcl::Window* pParent=pWin->GetParent();
                 while(pParent!=NULL)
                 {
                     aActivWinId=pParent->GetUniqueId();
@@ -1643,7 +1643,7 @@ void FormulaDlg_Impl::SetEdSelection()
     } // if( pEd )
 }
 
-FormulaModalDialog::FormulaModalDialog( Window* pParent
+FormulaModalDialog::FormulaModalDialog( vcl::Window* pParent
                                             , bool _bSupportFunctionResult
                                             , bool _bSupportResult
                                             , bool _bSupportMatrix
@@ -1692,7 +1692,7 @@ void FormulaModalDialog::RefInputDoneAfter( bool bForced )
     m_pImpl->RefInputDoneAfter( bForced );
 }
 
-void FormulaModalDialog::SetFocusWin(Window *pWin,const OString& nUniqueId)
+void FormulaModalDialog::SetFocusWin(vcl::Window *pWin,const OString& nUniqueId)
 {
     if(pWin->GetUniqueId()==nUniqueId)
     {
@@ -1704,7 +1704,7 @@ void FormulaModalDialog::SetFocusWin(Window *pWin,const OString& nUniqueId)
 
         for(sal_uInt16 i=0;i<nCount;i++)
         {
-            Window* pChild=pWin->GetChild(i);
+            vcl::Window* pChild=pWin->GetChild(i);
             SetFocusWin(pChild,nUniqueId);
         }
     }
@@ -1726,7 +1726,7 @@ void FormulaModalDialog::StoreFormEditData(FormEditData* pData)
 //      Initialisation / General functions  for Dialog
 
 FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
-                             Window* pParent
+                             vcl::Window* pParent
                             , bool _bSupportFunctionResult
                             , bool _bSupportResult
                             , bool _bSupportMatrix
@@ -1795,7 +1795,7 @@ void FormulaDlg::RefInputDoneAfter( bool bForced )
     m_pImpl->RefInputDoneAfter( bForced );
 }
 
-void FormulaDlg::SetFocusWin(Window *pWin,const OString& nUniqueId)
+void FormulaDlg::SetFocusWin(vcl::Window *pWin,const OString& nUniqueId)
 {
     if(pWin->GetUniqueId()==nUniqueId)
     {
@@ -1807,7 +1807,7 @@ void FormulaDlg::SetFocusWin(Window *pWin,const OString& nUniqueId)
 
         for(sal_uInt16 i=0;i<nCount;i++)
         {
-            Window* pChild=pWin->GetChild(i);
+            vcl::Window* pChild=pWin->GetChild(i);
             SetFocusWin(pChild,nUniqueId);
         }
     }
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 731c4f012154..e99674f50623 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -31,7 +31,7 @@
 namespace formula
 {
 
-FormulaListBox::FormulaListBox( Window* pParent, WinBits nBits ):
+FormulaListBox::FormulaListBox( vcl::Window* pParent, WinBits nBits ):
     ListBox(pParent, nBits)
 {}
 
@@ -57,7 +57,7 @@ bool FormulaListBox::PreNotify( NotifyEvent& rNEvt )
     return nResult;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFormulaListBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFormulaListBox(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new FormulaListBox(pParent, WB_BORDER | WB_SORT);
 }
@@ -71,7 +71,7 @@ inline sal_uInt16 Lb2Cat( sal_uInt16 nLbPos )
     return nLbPos;
 }
 
-FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager):
+FuncPage::FuncPage(vcl::Window* pParent,const IFunctionManager* _pFunctionManager):
     TabPage(pParent, "FunctionPage", "formula/ui/functionpage.ui"),
     m_pFunctionManager(_pFunctionManager)
 {
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 424acefe57bc..62d803dd8ed6 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -50,7 +50,7 @@ protected:
     virtual bool    PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
 public:
-                    FormulaListBox( Window* pParent, WinBits nBits );
+                    FormulaListBox( vcl::Window* pParent, WinBits nBits );
 
 };
 
@@ -85,7 +85,7 @@ protected:
 
 public:
 
-                    FuncPage( Window* pParent,const IFunctionManager* _pFunctionManager);
+                    FuncPage( vcl::Window* pParent,const IFunctionManager* _pFunctionManager);
 
     void            SetCategory(sal_Int32  nCat);
     void            SetFunction(sal_Int32  nFunc);
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index a6ca58b37c66..c02ed91cc37f 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -33,7 +33,7 @@ namespace formula
 {
 
 // class ArgEdit
-ArgEdit::ArgEdit( Window* pParent, WinBits nBits )
+ArgEdit::ArgEdit( vcl::Window* pParent, WinBits nBits )
     :   RefEdit( pParent, NULL, nBits ),
         pEdPrev ( NULL ),
         pEdNext ( NULL ),
@@ -42,7 +42,7 @@ ArgEdit::ArgEdit( Window* pParent, WinBits nBits )
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeArgEdit(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeArgEdit(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new ArgEdit(pParent, WB_BORDER);
 }
@@ -333,7 +333,7 @@ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd )
 
 // class EditBox
 
-EditBox::EditBox( Window* pParent, WinBits nBits )
+EditBox::EditBox( vcl::Window* pParent, WinBits nBits )
         :Control(pParent,nBits),
         bMouseFlag(false)
 {
@@ -354,7 +354,7 @@ EditBox::EditBox( Window* pParent, WinBits nBits )
     SetHelpId( "" );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeEditBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeEditBox(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new EditBox(pParent, WB_BORDER);
 }
@@ -457,7 +457,7 @@ void EditBox::UpdateOldSel()
 
 #define SC_ENABLE_TIME 100
 
-RefEdit::RefEdit( Window* _pParent, Window* pShrinkModeLabel, WinBits nStyle )
+RefEdit::RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle )
     : Edit( _pParent, nStyle )
     , pAnyRefDlg( NULL )
     , pLabelWidget(pShrinkModeLabel)
@@ -466,8 +466,8 @@ RefEdit::RefEdit( Window* _pParent, Window* pShrinkModeLabel, WinBits nStyle )
     aTimer.SetTimeout( SC_ENABLE_TIME );
 }
 
-RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent,
-    Window* pShrinkModeLabel, const ResId& rResId )
+RefEdit::RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent,
+    vcl::Window* pShrinkModeLabel, const ResId& rResId )
     : Edit( _pParent, rResId )
     , pAnyRefDlg( pParent )
     , pLabelWidget(pShrinkModeLabel)
@@ -476,7 +476,7 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent,
     aTimer.SetTimeout( SC_ENABLE_TIME );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefEdit(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new RefEdit(pParent, NULL, WB_BORDER);
 }
@@ -517,7 +517,7 @@ void RefEdit::StartUpdateData()
     aTimer.Start();
 }
 
-void RefEdit::SetReferences( IControlReferenceHandler* pDlg, Window* pLabel )
+void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel )
 {
     pAnyRefDlg = pDlg;
     pLabelWidget = pLabel;
@@ -571,7 +571,7 @@ IMPL_LINK_NOARG(RefEdit, UpdateHdl)
 }
 
 //class RefButton
-RefButton::RefButton( Window* _pParent, WinBits nStyle ) :
+RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) :
     ImageButton( _pParent, nStyle ),
     aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
     aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
@@ -583,7 +583,7 @@ RefButton::RefButton( Window* _pParent, WinBits nStyle ) :
     SetStartImage();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefButton(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefButton(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new RefButton(pParent, 0);
 }
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index d499a6d6d57c..9e3a647eed04 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -35,7 +35,7 @@ namespace formula
 {
 
 
-ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg):
+ParaWin::ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg):
     TabPage         (pParent, "ParameterPage", "formula/ui/parameter.ui"),
     pFuncDesc       ( NULL ),
     pMyParent       (_pDlg),
@@ -81,7 +81,7 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg):
     get(m_pSlider, "scrollbar");
 
     //lock down initial preferences
-    Window *pGrid = get<Window>("paramgrid");
+    vcl::Window *pGrid = get<vcl::Window>("paramgrid");
     pGrid->set_height_request(pGrid->get_preferred_size().Height());
     Size aSize(get_preferred_size());
     set_width_request(aSize.Width());
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index adb2e74e862b..a490133ecd1e 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -123,7 +123,7 @@ protected:
         void            UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i );
 
 public:
-                        ParaWin(Window* pParent,IControlReferenceHandler* _pDlg);
+                        ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg);
                         virtual ~ParaWin();
 
         void            SetFunctionDesc(const IFunctionDescription* pFDesc);
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 74a9de07f7d4..ea3cd2af9663 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -32,7 +32,7 @@
 
 namespace formula
 {
-StructListBox::StructListBox(Window* pParent, WinBits nBits ):
+StructListBox::StructListBox(vcl::Window* pParent, WinBits nBits ):
     SvTreeListBox(pParent, nBits)
 {
     bActiveFlag=false;
@@ -77,12 +77,12 @@ void StructListBox::LoseFocus()
     SvTreeListBox::LoseFocus();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeStructListBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeStructListBox(vcl::Window *pParent, VclBuilder::stringmap &)
 {
     return new StructListBox(pParent, WB_BORDER);
 }
 
-StructPage::StructPage(Window* pParent):
+StructPage::StructPage(vcl::Window* pParent):
     TabPage(pParent, "StructPage", "formula/ui/structpage.ui"),
     maImgEnd        ( ModuleRes( BMP_STR_END ) ),
     maImgError      ( ModuleRes( BMP_STR_ERROR ) ),
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 7b3c60655cf2..bdd4fcd7d70d 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -48,7 +48,7 @@ protected:
 
 public:
 
-                    StructListBox(Window* pParent, WinBits nBits );
+                    StructListBox(vcl::Window* pParent, WinBits nBits );
 
     /** Inserts an entry with static image (no difference between collapsed/expanded). */
     SvTreeListEntry*    InsertStaticEntry(
@@ -89,7 +89,7 @@ protected:
 
 public:
 
-                    StructPage( Window* pParent);
+                    StructPage( vcl::Window* pParent);
 
     void            ClearStruct();
     virtual SvTreeListEntry*    InsertEntry(const OUString& rText, SvTreeListEntry* pParent,