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 --- include/svx/optgrid.hxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/svx/optgrid.hxx') diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index df86d3240391..5339bfd55ef3 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -88,14 +88,11 @@ public: class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - public: SvxGridTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SvxGridTabPage() override; - static VclPtr Create(TabPageParent pParent, const SfxItemSet& rAttrSet); + static std::unique_ptr Create(TabPageParent pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; -- cgit