disinherit OWizardPage and SfxTabPage from vcl TabPage

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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 116ff56a9473..2f6938101f85 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -129,14 +129,8 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(TabPageParent pParent, const SfxI
 
 SvxDefaultColorOptPage::~SvxDefaultColorOptPage()
 {
-    disposeOnce();
-}
-
-void SvxDefaultColorOptPage::dispose()
-{
     m_xValSetColorBoxWin.reset();
     m_xValSetColorBox.reset();
-    SfxTabPage::dispose();
 }
 
 void SvxDefaultColorOptPage::Construct()
@@ -147,9 +141,9 @@ void SvxDefaultColorOptPage::Construct()
     m_xLbChartColors->select( 0 );
 }
 
-VclPtr<SfxTabPage> SvxDefaultColorOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs )
+std::unique_ptr<SfxTabPage> SvxDefaultColorOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs )
 {
-    return VclPtr<SvxDefaultColorOptPage>::Create( pParent, *rAttrs );
+    return std::make_unique<SvxDefaultColorOptPage>( pParent, *rAttrs );
 }
 
 bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )