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 /sc/source/ui/optdlg/tpview.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 'sc/source/ui/optdlg/tpview.cxx')
-rw-r--r-- | sc/source/ui/optdlg/tpview.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index a7151bded5e7..cf7a953795ed 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -126,10 +126,10 @@ void ScTpContentOptions::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> ScTpContentOptions::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTpContentOptions::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr<ScTpContentOptions>::Create(pParent, *rCoreSet); + return VclPtr<ScTpContentOptions>::Create(pParent.pParent, *rCoreSet); } bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet ) @@ -409,10 +409,10 @@ void ScTpLayoutOptions::dispose() } -VclPtr<SfxTabPage> ScTpLayoutOptions::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> ScTpLayoutOptions::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - VclPtrInstance<ScTpLayoutOptions> pNew( pParent, *rCoreSet ); + VclPtrInstance<ScTpLayoutOptions> pNew( pParent.pParent, *rCoreSet ); ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() ); if(pDocSh!=nullptr) |