diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-20 11:06:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-22 21:29:36 +0200 |
| commit | 60f3e4b843da89678e022eed837ee66e726b1920 (patch) | |
| tree | 4cffea5d364e3ed9bd3e68c7b471f313c237a98e /svx | |
| parent | 4a7ebfea57094b914c4b1c3e46936dbf67dec499 (diff) | |
place an intermediate class as parent for SfxTabPages
so a SfxTabPage can be parented by a vcl::Window or a welded native notebook tabpage.
That ways the same SfxTabPage can be used at the same time in both a native dialog
or a vcl dialog. The impl can be changed to the weld api, and when hosted in a native
dialog the vcl impl of that will be instantiated, while native otherwise. e.g.
print options appearing in print options dialog and general options.
This allows incremental changeover.
Change-Id: I6f1fed1e8d0898b01853bb878757bad41cbf9bba
Reviewed-on: https://gerrit.libreoffice.org/53193
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/hdft.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 50bc3eeb3256..5b6e63c6245e 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -112,18 +112,16 @@ namespace svx { } } -VclPtr<SfxTabPage> SvxHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxHeaderPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxHeaderPage>::Create( pParent, *rSet ); + return VclPtr<SvxHeaderPage>::Create( pParent.pParent, *rSet ); } - -VclPtr<SfxTabPage> SvxFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxFooterPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxFooterPage>::Create( pParent, *rSet ); + return VclPtr<SvxFooterPage>::Create( pParent.pParent, *rSet ); } - SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET ) @@ -131,7 +129,6 @@ SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : { } - SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET ) @@ -139,7 +136,6 @@ SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : { } - SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : SfxTabPage(pParent, "HFFormatPage", "svx/ui/headfootformatpage.ui", &rSet), nId(nSetId), |