fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

7 files changed, 25 insertions, 25 deletions

diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index e2ab95c9ab0f..73534ef15cff 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -108,7 +108,7 @@ class SmElementsControl : public Control
     void build();
 
 public:
-    SmElementsControl(Window *pParent, const ResId& rResId);
+    SmElementsControl(vcl::Window *pParent, const ResId& rResId);
     virtual ~SmElementsControl();
 
     void setElementSetId(sal_uInt16 aSetId);
@@ -138,7 +138,7 @@ public:
 
     SmElementsDockingWindow( SfxBindings* pBindings,
                              SfxChildWindow* pChildWindow,
-                             Window* pParent );
+                             vcl::Window* pParent );
     virtual ~SmElementsDockingWindow();
 
     virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) SAL_OVERRIDE;
@@ -150,7 +150,7 @@ class SmElementsDockingWindowWrapper : public SfxChildWindow
     SFX_DECL_CHILDWINDOW_WITHID(SmElementsDockingWindowWrapper);
 
 protected:
-    SmElementsDockingWindowWrapper( Window* pParentWindow,
+    SmElementsDockingWindowWrapper( vcl::Window* pParentWindow,
                                     sal_uInt16 nId,
                                     SfxBindings* pBindings,
                                     SfxChildWinInfo* pInfo );
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 3f4b317a8b9f..9e12d97dd320 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -67,19 +67,19 @@ class SmPrintOptionsTabPage : public SfxTabPage
     virtual void    Reset(const SfxItemSet* rSet) SAL_OVERRIDE;
 
 public:
-    static SfxTabPage* Create(Window *pWindow, const SfxItemSet &rSet);
+    static SfxTabPage* Create(vcl::Window *pWindow, const SfxItemSet &rSet);
 
-    SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &rOptions);
+    SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions);
 };
 
 /**************************************************************************/
 
-class SmShowFont : public Window
+class SmShowFont : public vcl::Window
 {
     virtual void Paint(const Rectangle&) SAL_OVERRIDE;
 
 public:
-    SmShowFont(Window *pParent, WinBits nStyle)
+    SmShowFont(vcl::Window *pParent, WinBits nStyle)
         : Window(pParent, nStyle)
     {
     }
@@ -106,7 +106,7 @@ class SmFontDialog : public ModalDialog
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
 public:
-    SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes);
+    SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes);
 
     const vcl::Font& GetFont() const { return Face; }
     void        SetFont(const vcl::Font &rFont);
@@ -127,7 +127,7 @@ class SmFontSizeDialog : public ModalDialog
     DECL_LINK(DefaultButtonClickHdl, Button *);
 
 public:
-    SmFontSizeDialog(Window *pParent);
+    SmFontSizeDialog(vcl::Window *pParent);
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -154,7 +154,7 @@ class SmFontTypeDialog : public ModalDialog
     DECL_LINK(HelpButtonClickHdl, Button *);
 
 public:
-    SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice);
+    SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice);
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -221,7 +221,7 @@ class SmDistanceDialog : public ModalDialog
     void    SetCategory(sal_uInt16 Category);
 
 public:
-    SmDistanceDialog(Window *pParent);
+    SmDistanceDialog(vcl::Window *pParent);
     virtual ~SmDistanceDialog();
 
     void ReadFrom(const SmFormat &rFormat);
@@ -245,7 +245,7 @@ class SmAlignDialog : public ModalDialog
     DECL_LINK(DefaultButtonClickHdl, Button *);
 
 public:
-    SmAlignDialog(Window *pParent);
+    SmAlignDialog(vcl::Window *pParent);
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -275,7 +275,7 @@ class SmShowSymbolSetWindow : public Control
 
     DECL_LINK( ScrollHdl, ScrollBar* );
 public:
-    SmShowSymbolSetWindow(Window *pParent, WinBits nStyle);
+    SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle);
     void setScrollbar(ScrollBar *pVScrollBar);
     void calccols();
     void    SelectSymbol(sal_uInt16 nSymbol);
@@ -292,7 +292,7 @@ class SmShowSymbolSet : public VclHBox
     Size        aOutputSize;
 
 public:
-    SmShowSymbolSet(Window *pParent);
+    SmShowSymbolSet(vcl::Window *pParent);
 
     void    SetSymbolSet(const SymbolPtrVec_t& rSymbolSet) { aSymbolWindow.SetSymbolSet(rSymbolSet); }
 
@@ -316,7 +316,7 @@ class SmShowSymbol : public Control
     void setFontSize(vcl::Font &rFont) const;
 
 public:
-    SmShowSymbol(Window *pParent, WinBits nStyle)
+    SmShowSymbol(vcl::Window *pParent, WinBits nStyle)
         : Control(pParent, nStyle)
     {
     }
@@ -360,7 +360,7 @@ class SmSymbolDialog : public ModalDialog
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
 public:
-    SmSymbolDialog(Window * pParent, OutputDevice *pFntListDevice,
+    SmSymbolDialog(vcl::Window * pParent, OutputDevice *pFntListDevice,
             SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell);
 
     bool    SelectSymbolSet(const OUString &rSymbolSetName);
@@ -376,7 +376,7 @@ class SmShowChar : public Control
     virtual void    Resize() SAL_OVERRIDE;
 
 public:
-    SmShowChar(Window *pParent, WinBits nStyle)
+    SmShowChar(vcl::Window *pParent, WinBits nStyle)
     : Control(pParent, nStyle)
     {
     }
@@ -453,7 +453,7 @@ class SmSymDefineDialog : public ModalDialog
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
 public:
-    SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr);
+    SmSymDefineDialog(vcl::Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr);
     virtual ~SmSymDefineDialog();
 
     using OutputDevice::SetFont;
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 8f7a665bc036..7c66fa6fafb2 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -45,7 +45,7 @@ class CommandEvent;
 
 /**************************************************************************/
 
-class SmEditWindow : public Window, public DropTargetHelper
+class SmEditWindow : public vcl::Window, public DropTargetHelper
 {
     ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible >  xAccessible;
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index b3af03d781e0..a49d8cad0f89 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -137,7 +137,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;
 };
 
 #define SM_MOD() ( *(SmModule**) GetAppData(SHL_SM) )
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index 8f50a055bb1f..472fe602c1a2 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -81,7 +81,7 @@ class SmToolBoxWrapper : public SfxChildWindow
     SFX_DECL_CHILDWINDOW_WITHID(SmToolBoxWrapper);
 
 protected:
-    SmToolBoxWrapper(Window *pParentWindow,
+    SmToolBoxWrapper(vcl::Window *pParentWindow,
                      sal_uInt16, SfxBindings*, SfxChildWinInfo*);
 };
 
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index f4a48e5d8d55..304c10c7e841 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -157,7 +157,7 @@ protected:
     DECL_LINK(SelectHdl, ListBox *);
 
 public:
-    SmFontPickListBox(Window* pParent, WinBits nBits);
+    SmFontPickListBox(vcl::Window* pParent, WinBits nBits);
 
     SmFontPickListBox& operator = (const SmFontPickList& rList);
 
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 38ad81456c4c..6b7939e99076 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -196,8 +196,8 @@ class SmCmdBoxWrapper : public SfxChildWindow
     SFX_DECL_CHILDWINDOW_WITHID(SmCmdBoxWrapper);
 
 protected:
-    SmCmdBoxWrapper(Window          *pParentWindow,
-                    sal_uInt16           nId,
+    SmCmdBoxWrapper(::vcl::Window   *pParentWindow,
+                    sal_uInt16       nId,
                     SfxBindings     *pBindings,
                     SfxChildWinInfo *pInfo);
 
@@ -264,7 +264,7 @@ protected:
     void InsertFrom(SfxMedium &rMedium);
 
     virtual bool HasPrintOptionsPage() const SAL_OVERRIDE;
-    virtual SfxTabPage *CreatePrintOptionsPage(Window           *pParent,
+    virtual SfxTabPage *CreatePrintOptionsPage(::vcl::Window    *pParent,
                                                const SfxItemSet &rOptions) SAL_OVERRIDE;
     virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE;
     virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE;