From a37e559ed123789f6bc8f7972242d6461ce692ab Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 20 Sep 2019 20:29:36 +0100 Subject: disinherit OWizardPage and SfxTabPage from vcl TabPage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that there's no need to support weld/unwelded mixes of pages in dialog any more. inherit from a BuilderPage which contains a Builder and Toplevel container BuilderPage Activate and Deactivate replace TabPage ActivatePage and DeactivatePage, allowing disambiguation wrt SfxTabPage ActivatePage and DeactivatePage. Change-Id: I5706e50fd92f712a25328ee9791e054bb9ad9812 Reviewed-on: https://gerrit.libreoffice.org/79317 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/options/fontsubs.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cui/source/options/fontsubs.cxx') diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index b7ffaeabd6a9..c308dd72d7ad 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -140,10 +140,10 @@ SvxFontSubstTabPage::~SvxFontSubstTabPage() { } -VclPtr SvxFontSubstTabPage::Create( TabPageParent pParent, +std::unique_ptr SvxFontSubstTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return std::make_unique(pParent, *rAttrSet); } bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) -- cgit v1.2.3