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, 6 insertions, 14 deletions

diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index d9f1b00a4a48..de6504b55363 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -377,17 +377,11 @@ ScTPValidationValue::ScTPValidationValue(TabPageParent pParent, const SfxItemSet
 
 ScTPValidationValue::~ScTPValidationValue()
 {
-    disposeOnce();
-}
-
-void ScTPValidationValue::dispose()
-{
     m_xEdMin.reset();
     m_xEdMin.reset();
     m_xEdMax.reset();
     m_xBtnRef.reset();
     m_xEdMax.reset();
-    SfxTabPage::dispose();
 }
 
 void ScTPValidationValue::Init()
@@ -410,9 +404,9 @@ void ScTPValidationValue::Init()
     CheckHdl( *m_xCbShow );
 }
 
-VclPtr<SfxTabPage> ScTPValidationValue::Create(TabPageParent pParent, const SfxItemSet* rArgSet)
+std::unique_ptr<SfxTabPage> ScTPValidationValue::Create(TabPageParent pParent, const SfxItemSet* rArgSet)
 {
-    return VclPtr<ScTPValidationValue>::Create(pParent, *rArgSet);
+    return std::make_unique<ScTPValidationValue>(pParent, *rArgSet);
 }
 
 void ScTPValidationValue::Reset( const SfxItemSet* rArgSet )
@@ -695,13 +689,12 @@ ScTPValidationHelp::ScTPValidationHelp(TabPageParent pParent, const SfxItemSet&
 
 ScTPValidationHelp::~ScTPValidationHelp()
 {
-    disposeOnce();
 }
 
-VclPtr<SfxTabPage> ScTPValidationHelp::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTPValidationHelp::Create(TabPageParent pParent,
                                               const SfxItemSet* rArgSet)
 {
-    return VclPtr<ScTPValidationHelp>::Create(pParent, *rArgSet);
+    return std::make_unique<ScTPValidationHelp>(pParent, *rArgSet);
 }
 
 void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet )
@@ -754,7 +747,6 @@ ScTPValidationError::ScTPValidationError(TabPageParent pParent,
 
 ScTPValidationError::~ScTPValidationError()
 {
-    disposeOnce();
 }
 
 void ScTPValidationError::Init()
@@ -767,10 +759,10 @@ void ScTPValidationError::Init()
     SelectActionHdl(*m_xLbAction);
 }
 
-VclPtr<SfxTabPage> ScTPValidationError::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTPValidationError::Create(TabPageParent pParent,
                                                const SfxItemSet* rArgSet)
 {
-    return VclPtr<ScTPValidationError>::Create(pParent, *rArgSet);
+    return std::make_unique<ScTPValidationError>(pParent, *rArgSet);
 }
 
 void ScTPValidationError::Reset( const SfxItemSet* rArgSet )