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 --- chart2/source/controller/dialogs/tp_Trendline.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chart2/source/controller/dialogs/tp_Trendline.cxx') diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index 176ba723684e..8909c11257c2 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -31,9 +31,9 @@ TrendlineTabPage::TrendlineTabPage( vcl::Window* pParent, const SfxItemSet& rInA } VclPtr TrendlineTabPage::Create( - vcl::Window* pParent, const SfxItemSet* rOutAttrs ) + TabPageParent pParent, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pParent, *rOutAttrs ); + return VclPtr::Create( pParent.pParent, *rOutAttrs ); } bool TrendlineTabPage::FillItemSet( SfxItemSet* rOutAttrs ) -- cgit