diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-20 14:00:04 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-20 15:13:23 +0100 |
commit | f12488405cdfd8555078d15807aafc5ffd1b037b (patch) | |
tree | 487b1ae6138d7f2c320a9846289ee7c422d5b8a3 /dbaccess/source/ext | |
parent | sc: convert new to ::Create (diff) | |
download | core-f12488405cdfd8555078d15807aafc5ffd1b037b.tar.gz core-f12488405cdfd8555078d15807aafc5ffd1b037b.zip |
dbaccess: convert new to ::Create.
Also convert svtools' WizardShell::createPage.
Change-Id: I09bd40ef4748aa2de7b49eeefc95be06b545ea05
Diffstat (limited to 'dbaccess/source/ext')
-rw-r--r-- | dbaccess/source/ext/macromigration/macromigrationpages.cxx | 16 | ||||
-rw-r--r-- | dbaccess/source/ext/macromigration/macromigrationpages.hxx | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 65f033b84c4e..c97494f41fda 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -83,9 +83,9 @@ namespace dbmm m_pCloseDocError->Show( _bShow ); } - TabPage* PreparationPage::Create( ::svt::RoadmapWizard& _rParentDialog ) + VclPtr<TabPage> PreparationPage::Create( ::svt::RoadmapWizard& _rParentDialog ) { - return new PreparationPage(&_rParentDialog); + return VclPtr<PreparationPage>::Create(&_rParentDialog); } // SaveDBDocPage @@ -176,9 +176,9 @@ namespace dbmm return true; } - TabPage* SaveDBDocPage::Create( ::svt::RoadmapWizard& _rParentDialog ) + VclPtr<TabPage> SaveDBDocPage::Create( ::svt::RoadmapWizard& _rParentDialog ) { - return new SaveDBDocPage( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) ); + return VclPtr<SaveDBDocPage>::Create( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) ); } // ProgressPage @@ -209,9 +209,9 @@ namespace dbmm MacroMigrationPage::dispose(); } - TabPage* ProgressPage::Create(::svt::RoadmapWizard& _rParentDialog) + VclPtr<TabPage> ProgressPage::Create(::svt::RoadmapWizard& _rParentDialog) { - return new ProgressPage(&_rParentDialog); + return VclPtr<ProgressPage>::Create(&_rParentDialog); } void ProgressPage::setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports ) @@ -304,9 +304,9 @@ namespace dbmm MacroMigrationPage::dispose(); } - TabPage* ResultPage::Create(::svt::RoadmapWizard& _rParentDialog) + VclPtr<TabPage> ResultPage::Create(::svt::RoadmapWizard& _rParentDialog) { - return new ResultPage(&_rParentDialog); + return VclPtr<ResultPage>::Create(&_rParentDialog); } void ResultPage::displayMigrationLog(const bool _bSuccessful, const OUString& _rSummary) diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx index d7d11ca8bdab..70a70826783f 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -60,7 +60,7 @@ namespace dbmm virtual ~PreparationPage(); virtual void dispose() SAL_OVERRIDE; - static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); + static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog ); public: void showCloseDocsError(bool _bShow); @@ -76,7 +76,7 @@ namespace dbmm SaveDBDocPage(MacroMigrationDialog& _rParentDialog); virtual ~SaveDBDocPage(); virtual void dispose() SAL_OVERRIDE; - static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); + static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog ); public: OUString getBackupLocation() const { return m_pLocationController->getURL(); } @@ -107,7 +107,7 @@ namespace dbmm virtual ~ProgressPage(); virtual void dispose() SAL_OVERRIDE; - static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); + static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog ); void setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports ); void onFinishedSuccessfully(); @@ -140,7 +140,7 @@ namespace dbmm virtual ~ResultPage(); virtual void dispose() SAL_OVERRIDE; - static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); + static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog ); void displayMigrationLog( const bool _bSuccessful, const OUString& _rLog ); |