dbaccess: convert new to ::Create.

Also convert svtools' WizardShell::createPage.

Change-Id: I09bd40ef4748aa2de7b49eeefc95be06b545ea05

8 files changed, 27 insertions, 28 deletions

diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 6cfda0bd9da4..f06fa97156f9 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -408,24 +408,24 @@ namespace abp
     }
 
 
-    OWizardPage* OAddessBookSourcePilot::createPage(WizardState _nState)
+    VclPtr<TabPage> OAddessBookSourcePilot::createPage(WizardState _nState)
     {
         switch (_nState)
         {
             case STATE_SELECT_ABTYPE:
-                return new TypeSelectionPage( this );
+                return VclPtr<TypeSelectionPage>::Create( this );
 
             case STATE_INVOKE_ADMIN_DIALOG:
-                return new AdminDialogInvokationPage( this );
+                return VclPtr<AdminDialogInvokationPage>::Create( this );
 
             case STATE_TABLE_SELECTION:
-                return new TableSelectionPage( this );
+                return VclPtr<TableSelectionPage>::Create( this );
 
             case STATE_MANUAL_FIELD_MAPPING:
-                return new FieldMappingPage( this );
+                return VclPtr<FieldMappingPage>::Create( this );
 
             case STATE_FINAL_CONFIRM:
-                return new FinalPage( this );
+                return VclPtr<FinalPage>::Create( this );
 
             default:
                 OSL_FAIL("OAddessBookSourcePilot::createPage: invalid state!");
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 5c67bc15b36d..fdb284eb7eea 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -67,7 +67,7 @@ namespace abp
 
     protected:
         // OWizardMachine overridables
-        virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE;
+        virtual VclPtr<TabPage>     createPage( WizardState _nState ) SAL_OVERRIDE;
         virtual void                enterState( WizardState _nState ) SAL_OVERRIDE;
         virtual bool                prepareLeaveCurrentState( CommitPageReason _eReason ) SAL_OVERRIDE;
         virtual bool                onFinish() SAL_OVERRIDE;
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 8332ed05d72b..adfb50b03b96 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -227,17 +227,16 @@ namespace dbp
     }
 
 
-    OWizardPage* OGridWizard::createPage(WizardState _nState)
+    VclPtr<TabPage> OGridWizard::createPage(WizardState _nState)
     {
         switch (_nState)
         {
             case GW_STATE_DATASOURCE_SELECTION:
-                return new OTableSelectionPage(this);
+                return VclPtr<OTableSelectionPage>::Create(this);
             case GW_STATE_FIELDSELECTION:
-                return new OGridFieldsSelection(this);
+                return VclPtr<OGridFieldsSelection>::Create(this);
         }
-
-        return NULL;
+        return VclPtr<TabPage>();
     }
 
 
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index 42db6683d176..9c66ae9e72cd 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -56,7 +56,7 @@ namespace dbp
 
     protected:
         // OWizardMachine overridables
-        virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE;
+        virtual VclPtr<TabPage>     createPage( WizardState _nState ) SAL_OVERRIDE;
         virtual WizardState         determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE;
         virtual void                enterState( WizardState _nState ) SAL_OVERRIDE;
         virtual bool                leaveState( WizardState _nState ) SAL_OVERRIDE;
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 0eb66b743d2e..fbcaa668990b 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -69,24 +69,24 @@ namespace dbp
     }
 
 
-    OWizardPage* OGroupBoxWizard::createPage(::svt::WizardTypes::WizardState _nState)
+    VclPtr<TabPage> OGroupBoxWizard::createPage(::svt::WizardTypes::WizardState _nState)
     {
         switch (_nState)
         {
             case GBW_STATE_OPTIONLIST:
-                return new ORadioSelectionPage(this);
+                return VclPtr<ORadioSelectionPage>::Create(this);
 
             case GBW_STATE_DEFAULTOPTION:
-                return new ODefaultFieldSelectionPage(this);
+                return VclPtr<ODefaultFieldSelectionPage>::Create(this);
 
             case GBW_STATE_OPTIONVALUES:
-                return new OOptionValuesPage(this);
+                return VclPtr<OOptionValuesPage>::Create(this);
 
             case GBW_STATE_DBFIELD:
-                return new OOptionDBFieldPage(this);
+                return VclPtr<OOptionDBFieldPage>::Create(this);
 
             case GBW_STATE_FINALIZE:
-                return new OFinalizeGBWPage(this);
+                return VclPtr<OFinalizeGBWPage>::Create(this);
         }
 
         return NULL;
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index b594d5b59eae..9413628bcc88 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -62,7 +62,7 @@ namespace dbp
 
     protected:
         // OWizardMachine overridables
-        virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE;
+        virtual VclPtr<TabPage>     createPage( WizardState _nState ) SAL_OVERRIDE;
         virtual WizardState         determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE;
         virtual void                enterState( WizardState _nState ) SAL_OVERRIDE;
         virtual bool                onFinish() SAL_OVERRIDE;
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 155e1b25a729..0173584e3455 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -88,23 +88,23 @@ namespace dbp
     }
 
 
-    OWizardPage* OListComboWizard::createPage(WizardState _nState)
+    VclPtr<TabPage> OListComboWizard::createPage(WizardState _nState)
     {
         switch (_nState)
         {
             case LCW_STATE_DATASOURCE_SELECTION:
-                return new OTableSelectionPage(this);
+                return VclPtr<OTableSelectionPage>::Create(this);
             case LCW_STATE_TABLESELECTION:
-                return new OContentTableSelection(this);
+                return VclPtr<OContentTableSelection>::Create(this);
             case LCW_STATE_FIELDSELECTION:
-                return new OContentFieldSelection(this);
+                return VclPtr<OContentFieldSelection>::Create(this);
             case LCW_STATE_FIELDLINK:
-                return new OLinkFieldsPage(this);
+                return VclPtr<OLinkFieldsPage>::Create(this);
             case LCW_STATE_COMBODBFIELD:
-                return new OComboDBFieldPage(this);
+                return VclPtr<OComboDBFieldPage>::Create(this);
         }
 
-        return NULL;
+        return VclPtr<TabPage>();
     }
 
 
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index d1d05fbc8e04..ec28093479ce 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -68,7 +68,7 @@ namespace dbp
 
     protected:
         // OWizardMachine overridables
-        virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE;
+        virtual VclPtr<TabPage>     createPage( WizardState _nState ) SAL_OVERRIDE;
         virtual WizardState         determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE;
         virtual void                enterState( WizardState _nState ) SAL_OVERRIDE;
         virtual bool                leaveState( WizardState _nState ) SAL_OVERRIDE;