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/scuitphfedit.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/scuitphfedit.hxx')
-rw-r--r-- | sc/source/ui/inc/scuitphfedit.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index f3720363e2c1..b2d133c2cdb8 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -52,7 +52,7 @@ public: void ClearTextAreas(); protected: - ScHFEditPage( Window* pParent, + ScHFEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet, sal_uInt16 nWhich, bool bHeader ); @@ -104,37 +104,37 @@ private: class ScRightHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); + ScRightHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScLeftHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); + ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScRightFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); + ScRightFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScLeftFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet ); + ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; #endif |