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 /sw/source/ui/envelp/label1.cxx | |
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 'sw/source/ui/envelp/label1.cxx')
-rw-r--r-- | sw/source/ui/envelp/label1.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 3f8daf71e599..a6a6f93cc0c8 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -486,9 +486,9 @@ void SwLabPage::InitDatabaseBox() } } -VclPtr<SfxTabPage> SwLabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwLabPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<SwLabPage>::Create(pParent, *rSet); + return VclPtr<SwLabPage>::Create(pParent.pParent, *rSet); } void SwLabPage::ActivatePage(const SfxItemSet& rSet) @@ -631,9 +631,9 @@ void SwVisitingCardPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SwVisitingCardPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwVisitingCardPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<SwVisitingCardPage>::Create(pParent, *rSet); + return VclPtr<SwVisitingCardPage>::Create(pParent.pParent, *rSet); } void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet) @@ -793,9 +793,9 @@ void SwPrivateDataPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SwPrivateDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwPrivateDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<SwPrivateDataPage>::Create(pParent, *rSet); + return VclPtr<SwPrivateDataPage>::Create(pParent.pParent, *rSet); } void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet) @@ -906,9 +906,9 @@ void SwBusinessDataPage::dispose() } -VclPtr<SfxTabPage> SwBusinessDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SwBusinessDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<SwBusinessDataPage>::Create(pParent, *rSet); + return VclPtr<SwBusinessDataPage>::Create(pParent.pParent, *rSet); } void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet) |