include/svx/hdft.hxx | 4 ++-- svx/source/dialog/hdft.cxx | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-)
New commits: commit 412c1a3089904a95e18b3ac34eb432e4b87c8fbb Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu Aug 30 09:57:11 2018 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Thu Aug 30 17:13:57 2018 +0200 weld SvxHeaderPage/SvxHeaderPage Change-Id: I86f14a38c32baf46ccb5674005192fea2665719d Reviewed-on: https://gerrit.libreoffice.org/59801 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index d7d910c772ba..6a0eeb7980a3 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -104,7 +104,7 @@ public: static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); // returns the Which values to the range static const sal_uInt16* GetRanges() { return pRanges; } - SVX_DLLPRIVATE SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ); + SVX_DLLPRIVATE SvxHeaderPage(TabPageParent pParent, const SfxItemSet& rSet); }; class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage @@ -112,7 +112,7 @@ class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage public: static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pRanges; } - SVX_DLLPRIVATE SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ); + SVX_DLLPRIVATE SvxFooterPage(TabPageParent pParent, const SfxItemSet& rSet); }; class SVX_DLLPUBLIC DeleteHeaderDialog : public weld::MessageDialogController diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 7ca86e2e132c..b0e8661f1c03 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -108,25 +108,21 @@ namespace svx { VclPtr<SfxTabPage> SvxHeaderPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxHeaderPage>::Create( pParent.pParent, *rSet ); + return VclPtr<SvxHeaderPage>::Create( pParent, *rSet ); } VclPtr<SfxTabPage> SvxFooterPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxFooterPage>::Create( pParent.pParent, *rSet ); + return VclPtr<SvxFooterPage>::Create( pParent, *rSet ); } -SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : - - SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET ) - +SvxHeaderPage::SvxHeaderPage(TabPageParent pParent, const SfxItemSet& rAttr) + : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET ) { } -SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : - - SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET ) - +SvxFooterPage::SvxFooterPage(TabPageParent pParent, const SfxItemSet& rAttr) + : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET ) { } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits