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/colex.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/colex.hxx')
| -rw-r--r-- | sw/source/uibase/inc/colex.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index 1bc29f9b39c2..ce03ddce93b2 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -31,7 +31,7 @@ class SfxItemSet; class SW_DLLPUBLIC SwPageExample : public SvxPageWindow { public: - SwPageExample(Window* pPar) + SwPageExample(vcl::Window* pPar) : SvxPageWindow(pPar) { SetSize(SvxPaperInfo::GetPaperSize(PAPER_A4)); @@ -51,7 +51,7 @@ protected: const bool bSecond, const bool bEnabled ) SAL_OVERRIDE; public: - SwPageGridExample(Window* pPar) : + SwPageGridExample(vcl::Window* pPar) : SwPageExample(pPar), pGridItem(0), m_bVertical(false){} @@ -72,7 +72,7 @@ protected: const bool bEnabled ) SAL_OVERRIDE; public: - SwColExample(Window* pPar) + SwColExample(vcl::Window* pPar) : SwPageExample(pPar) , pColMgr(0) { @@ -85,7 +85,7 @@ public: } }; -class SW_DLLPUBLIC SwColumnOnlyExample : public Window +class SW_DLLPUBLIC SwColumnOnlyExample : public vcl::Window { private: Size m_aWinSize; @@ -97,7 +97,7 @@ protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - SwColumnOnlyExample(Window*); + SwColumnOnlyExample(vcl::Window*); void SetColumns(const SwFmtCol& rCol); |