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/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 1f7abce1eafb..936a1b8df51f 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -144,16 +144,10 @@ SvxColorTabPage::SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAtt
 
 SvxColorTabPage::~SvxColorTabPage()
 {
-    disposeOnce();
-}
-
-void SvxColorTabPage::dispose()
-{
     m_xValSetRecentListWin.reset();
     m_xValSetRecentList.reset();
     m_xValSetColorListWin.reset();
     m_xValSetColorList.reset();
-    SfxTabPage::dispose();
 }
 
 void SvxColorTabPage::ImpColorCountChanged()
@@ -268,9 +262,9 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet )
     UpdateModified();
 }
 
-VclPtr<SfxTabPage> SvxColorTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SvxColorTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
 {
-    return VclPtr<SvxColorTabPage>::Create(pParent, *rOutAttrs);
+    return std::make_unique<SvxColorTabPage>(pParent, *rOutAttrs);
 }
 
 // is called when the content of the MtrFields is changed for color values