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 /cui/source/tabpages/paragrph.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 'cui/source/tabpages/paragrph.cxx')
-rw-r--r-- | cui/source/tabpages/paragrph.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index ad36ba0a686e..f17c35b3129b 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -196,9 +196,9 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl, Control&, void) m_pRightIndent->SetEmptyFieldValue(); } -VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr<SvxStdParagraphTabPage>::Create( pParent, *rSet ); + return VclPtr<SvxStdParagraphTabPage>::Create( pParent.pParent, *rSet ); } bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -1112,9 +1112,9 @@ DeactivateRC SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return DeactivateRC::LeavePage; } -VclPtr<SfxTabPage> SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxParaAlignTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxParaAlignTabPage>::Create(pParent, *rSet); + return VclPtr<SvxParaAlignTabPage>::Create(pParent.pParent, *rSet); } bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -1390,10 +1390,10 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet) EnableJustifyExt(); } -VclPtr<SfxTabPage> SvxExtParagraphTabPage::Create( vcl::Window* pParent, +VclPtr<SfxTabPage> SvxExtParagraphTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxExtParagraphTabPage>::Create( pParent, *rSet ); + return VclPtr<SvxExtParagraphTabPage>::Create( pParent.pParent, *rSet ); } bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -2267,9 +2267,9 @@ void SvxAsianTabPage::dispose() SfxTabPage::dispose(); } -VclPtr<SfxTabPage> SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> SvxAsianTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxAsianTabPage>::Create(pParent, *rSet); + return VclPtr<SvxAsianTabPage>::Create(pParent.pParent, *rSet); } const sal_uInt16* SvxAsianTabPage::GetRanges() |