diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /sw/source/uibase/inc/envlop.hxx | |
parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'sw/source/uibase/inc/envlop.hxx')
-rw-r--r-- | sw/source/uibase/inc/envlop.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 7c438dd942c9..6ae6b7fb2b1e 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -40,13 +40,13 @@ class SwEnvFmtPage; class SwWrtShell; class Printer; -class SwEnvPreview : public Window +class SwEnvPreview : public vcl::Window { void Paint(const Rectangle&) SAL_OVERRIDE; public: - SwEnvPreview(Window * pParent, WinBits nStyle); + SwEnvPreview(vcl::Window * pParent, WinBits nStyle); protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -71,7 +71,7 @@ friend class SwEnvPreview; virtual short Ok() SAL_OVERRIDE; public: - SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert); + SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert); virtual ~SwEnvDlg(); }; @@ -89,7 +89,7 @@ class SwEnvPage : public SfxTabPage SwWrtShell* pSh; OUString sActDBName; - SwEnvPage(Window* pParent, const SfxItemSet& rSet); + SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwEnvPage(); DECL_LINK( DatabaseHdl, ListBox * ); @@ -105,7 +105,7 @@ class SwEnvPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; |