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 /include/svx/hdft.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 'include/svx/hdft.hxx')
-rw-r--r-- | include/svx/hdft.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 1569f9ed73d9..d7f15be412e2 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -31,7 +31,7 @@ namespace svx { - SVX_DLLPUBLIC bool ShowBorderBackgroundDlg( Window* pParent, SfxItemSet* pBBSet, + SVX_DLLPUBLIC bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet, bool bEnableBackgroundSelector ); } @@ -65,7 +65,7 @@ protected: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); + SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); FixedText* m_pPageLbl; CheckBox* m_pTurnOnBox; @@ -110,11 +110,11 @@ private: class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: - SvxHeaderPage( Window* pParent, const SfxItemSet& rSet ); + SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; // class SvxFooterPage --------------------------------------------------- @@ -122,17 +122,17 @@ private: class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: - SVX_DLLPRIVATE SvxFooterPage( Window* pParent, const SfxItemSet& rSet ); + SVX_DLLPRIVATE SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class SVX_DLLPUBLIC DeleteHeaderDialog : public MessageDialog { public: - DeleteHeaderDialog(Window *pParent) + DeleteHeaderDialog(vcl::Window *pParent) : MessageDialog(pParent, "DeleteHeaderDialog", "svx/ui/deleteheaderdialog.ui") { @@ -142,7 +142,7 @@ public: class SVX_DLLPUBLIC DeleteFooterDialog : public MessageDialog { public: - DeleteFooterDialog(Window *pParent) + DeleteFooterDialog(vcl::Window *pParent) : MessageDialog(pParent, "DeleteFooterDialog", "svx/ui/deletefooterdialog.ui") { |