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/customize/cfg.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/customize/cfg.cxx')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 762570f5a3d3..fb1195c73b39 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -175,29 +175,29 @@ SvxConfigPage::CanConfig( const OUString& aModuleId ) return !(aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography"); } -VclPtr<SfxTabPage> CreateSvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxMenuConfigPage>::Create( pParent, *rSet ); + return VclPtr<SvxMenuConfigPage>::Create( pParent.pParent, *rSet ); } -VclPtr<SfxTabPage> CreateSvxContextMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxContextMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxMenuConfigPage>::Create( pParent, *rSet, false ); + return VclPtr<SvxMenuConfigPage>::Create( pParent.pParent, *rSet, false ); } -VclPtr<SfxTabPage> CreateKeyboardConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateKeyboardConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SfxAcceleratorConfigPage>::Create( pParent, *rSet ); + return VclPtr<SfxAcceleratorConfigPage>::Create( pParent.pParent, *rSet ); } -VclPtr<SfxTabPage> CreateSvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxToolbarConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxToolbarConfigPage>::Create( pParent, *rSet ); + return VclPtr<SvxToolbarConfigPage>::Create( pParent.pParent, *rSet ); } -VclPtr<SfxTabPage> CreateSvxEventConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr<SfxTabPage> CreateSvxEventConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr<SvxEventConfigPage>::Create( pParent, *rSet, SvxEventConfigPage::EarlyInit() ); + return VclPtr<SvxEventConfigPage>::Create( pParent.pParent, *rSet, SvxEventConfigPage::EarlyInit() ); } /****************************************************************************** |