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/app/scmod.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/app/scmod.cxx')
| -rw-r--r-- | sc/source/ui/app/scmod.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index f13ea7092623..6e05952509f2 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2036,7 +2036,7 @@ void ScModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } } -VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) +VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) { VclPtr<SfxTabPage> pRet; ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -2058,7 +2058,7 @@ VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent break; } case SID_SC_TP_GRID: - pRet = SvxGridTabPage::Create(pParent, rSet); + pRet = SvxGridTabPage::Create(pParent.pParent, rSet); break; case SID_SC_TP_USERLISTS: { |