From 60f3e4b843da89678e022eed837ee66e726b1920 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 20 Apr 2018 11:06:07 +0100 Subject: place an intermediate class as parent for SfxTabPages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/tabpages/transfrm.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cui/source/tabpages/transfrm.cxx') diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index b930cba2804e..b455872dd343 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -321,9 +321,9 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) } -VclPtr SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) +VclPtr SvxAngleTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet) { - return VclPtr::Create(pWindow, *rSet); + return VclPtr::Create(pWindow.pParent, *rSet); } @@ -747,9 +747,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) } } -VclPtr SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr SvxSlantTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pWindow, *rOutAttrs ); + return VclPtr::Create( pWindow.pParent, *rOutAttrs ); } void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) @@ -1209,9 +1209,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) } -VclPtr SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr SvxPositionSizeTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pWindow, *rOutAttrs ); + return VclPtr::Create( pWindow.pParent, *rOutAttrs ); } -- cgit v1.2.3