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/tpview.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/tpview.hxx')
| -rw-r--r-- | sc/source/ui/inc/tpview.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 49c8e815fdb0..e426d9c742a9 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -64,12 +64,12 @@ class ScTpContentOptions : public SfxTabPage DECL_LINK( SelLbObjHdl, ListBox* ); DECL_LINK( CBHdl, CheckBox* ); - ScTpContentOptions( Window* pParent, + ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTpContentOptions(); public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; @@ -112,12 +112,12 @@ class ScTpLayoutOptions : public SfxTabPage DECL_LINK( UpdateHdl, CheckBox* ); - ScTpLayoutOptions( Window* pParent, + ScTpLayoutOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTpLayoutOptions(); public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; |