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>

4 files changed, 12 insertions, 12 deletions

diff --git a/chart2/source/controller/inc/TabPageNotifiable.hxx b/chart2/source/controller/inc/TabPageNotifiable.hxx
index 01e7b490d5a3..d9ba555887fd 100644
--- a/chart2/source/controller/inc/TabPageNotifiable.hxx
+++ b/chart2/source/controller/inc/TabPageNotifiable.hxx
@@ -24,7 +24,7 @@
 // color to use as background for an invalid range
 #define RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR Color(0xff6563)
 
-class TabPage;
+class BuilderPage;
 
 namespace chart
 {
@@ -32,8 +32,8 @@ namespace chart
 class TabPageNotifiable
 {
 public:
-    virtual void setInvalidPage( TabPage * pTabPage ) = 0;
-    virtual void setValidPage( TabPage * pTabPage ) = 0;
+    virtual void setInvalidPage( BuilderPage * pTabPage ) = 0;
+    virtual void setValidPage( BuilderPage * pTabPage ) = 0;
 
 protected:
     ~TabPageNotifiable() {}
diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx
index 7483dcd84118..3b01f54b76af 100644
--- a/chart2/source/controller/inc/dlg_ChartType.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType.hxx
@@ -37,7 +37,7 @@ public:
 private:
     css::uno::Reference<css::frame::XModel> m_xChartModel;
     std::unique_ptr<weld::Container> m_xContentArea;
-    VclPtr<ChartTypeTabPage> m_xChartTypeTabPage;
+    std::unique_ptr<ChartTypeTabPage> m_xChartTypeTabPage;
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index ae5067503bef..e6051054d257 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -50,8 +50,8 @@ public:
     virtual ~CreationWizard() override;
 
     // TabPageNotifiable
-    virtual void setInvalidPage(TabPage * pTabPage) override;
-    virtual void setValidPage(TabPage * pTabPage) override;
+    virtual void setInvalidPage(BuilderPage * pTabPage) override;
+    virtual void setValidPage(BuilderPage * pTabPage) override;
 
 protected:
     virtual bool leaveState( WizardState _nState ) override;
@@ -61,7 +61,7 @@ protected:
     virtual OUString getStateDisplayName(WizardState nState) const override;
 
 private:
-    virtual VclPtr<TabPage> createPage(WizardState nState) override;
+    virtual std::unique_ptr<BuilderPage> createPage(WizardState nState) override;
 
     css::uno::Reference<css::chart2::XChartDocument> m_xChartModel;
     css::uno::Reference<css::uno::XComponentContext> m_xComponentContext;
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index b708a2c97a8d..680256d1db53 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponen
 
 #include <memory>
 
-class TabPage;
+class BuilderPage;
 
 namespace chart
 {
@@ -54,8 +54,8 @@ public:
     virtual short run() override;
 
     // TabPageNotifiable
-    virtual void setInvalidPage( TabPage * pTabPage ) override;
-    virtual void setValidPage( TabPage * pTabPage ) override;
+    virtual void setInvalidPage( BuilderPage * pTabPage ) override;
+    virtual void setValidPage( BuilderPage * pTabPage ) override;
 
 private:
     void DisableTabToggling();
@@ -67,8 +67,8 @@ private:
     std::unique_ptr< ChartTypeTemplateProvider >  m_apDocTemplateProvider;
     std::unique_ptr< DialogModel >                m_apDialogModel;
 
-    VclPtr<RangeChooserTabPage> m_pRangeChooserTabPage;
-    VclPtr<DataSourceTabPage>   m_pDataSourceTabPage;
+    std::unique_ptr<RangeChooserTabPage> m_xRangeChooserTabPage;
+    std::unique_ptr<DataSourceTabPage> m_xDataSourceTabPage;
     bool                  m_bRangeChooserTabIsValid;
     bool                  m_bDataSourceTabIsValid;
     bool                  m_bTogglingEnabled;