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 /sc/source/ui/inc/tpsort.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 'sc/source/ui/inc/tpsort.hxx')
-rw-r--r-- | sc/source/ui/inc/tpsort.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 7a900e70aec3..8eaf1ec057da 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -47,11 +47,11 @@ struct ScSortParam; class ScTabPageSortFields : public SfxTabPage { public: - ScTabPageSortFields( Window* pParent, + ScTabPageSortFields( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTabPageSortFields(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -106,13 +106,13 @@ class CollatorWrapper; class ScTabPageSortOptions : public SfxTabPage { public: - ScTabPageSortOptions( Window* pParent, + ScTabPageSortOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTabPageSortOptions(); #undef SfxTabPage #define SfxTabPage ::SfxTabPage - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; |