diff options
Diffstat (limited to 'dbaccess/source/ext')
5 files changed, 87 insertions, 32 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index c643e8042942..b778fd68587e 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -406,8 +406,8 @@ namespace dbmm // check that the backup location isn't the same as the document itself if ( lcl_equalURLs_nothrow( m_pData->aContext, sBackupLocation, m_pData->xDocumentModel->getURL() ) ) { - MessageDialog aErrorBox( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) ); - aErrorBox.Execute(); + ScopedVclPtrInstance< MessageDialog > aErrorBox( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) ); + aErrorBox->Execute(); rBackupPage.grabLocationFocus(); return false; } diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index c4ccd03e6353..c97494f41fda 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -67,14 +67,25 @@ namespace dbmm get(m_pCloseDocError, "closedocerror"); } + PreparationPage::~PreparationPage() + { + disposeOnce(); + } + + void PreparationPage::dispose() + { + m_pCloseDocError.clear(); + MacroMigrationPage::dispose(); + } + void PreparationPage::showCloseDocsError( bool _bShow ) { 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 @@ -95,7 +106,16 @@ namespace dbmm SaveDBDocPage::~SaveDBDocPage() { + disposeOnce(); + } + + void SaveDBDocPage::dispose() + { delete m_pLocationController; + m_pSaveAsLocation.clear(); + m_pBrowseSaveAsLocation.clear(); + m_pStartMigration.clear(); + MacroMigrationPage::dispose(); } void SaveDBDocPage::impl_updateLocationDependentItems() @@ -156,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 @@ -174,9 +194,24 @@ namespace dbmm get(m_pMigrationDone, "done"); } - TabPage* ProgressPage::Create(::svt::RoadmapWizard& _rParentDialog) + ProgressPage::~ProgressPage() { - return new ProgressPage(&_rParentDialog); + disposeOnce(); + } + + void ProgressPage::dispose() + { + m_pObjectCount.clear(); + m_pCurrentObject.clear(); + m_pCurrentAction.clear(); + m_pAllProgressText.clear(); + m_pMigrationDone.clear(); + MacroMigrationPage::dispose(); + } + + VclPtr<TabPage> ProgressPage::Create(::svt::RoadmapWizard& _rParentDialog) + { + return VclPtr<ProgressPage>::Create(&_rParentDialog); } void ProgressPage::setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports ) @@ -256,9 +291,22 @@ namespace dbmm get(m_pFailureLabel, "failure"); } - TabPage* ResultPage::Create(::svt::RoadmapWizard& _rParentDialog) + ResultPage::~ResultPage() + { + disposeOnce(); + } + + void ResultPage::dispose() + { + m_pSuccessLabel.clear(); + m_pFailureLabel.clear(); + m_pChanges.clear(); + MacroMigrationPage::dispose(); + } + + 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 fc6ffc934521..70a70826783f 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -57,14 +57,16 @@ namespace dbmm { public: PreparationPage(vcl::Window *pParent); + 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); protected: - FixedText* m_pCloseDocError; + VclPtr<FixedText> m_pCloseDocError; }; // SaveDBDocPage @@ -73,16 +75,17 @@ namespace dbmm public: SaveDBDocPage(MacroMigrationDialog& _rParentDialog); virtual ~SaveDBDocPage(); - static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); + virtual void dispose() SAL_OVERRIDE; + static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog ); public: OUString getBackupLocation() const { return m_pLocationController->getURL(); } void grabLocationFocus() { m_pSaveAsLocation->GrabFocus(); } protected: - ::svt::OFileURLControl* m_pSaveAsLocation; - PushButton* m_pBrowseSaveAsLocation; - FixedText* m_pStartMigration; + VclPtr<::svt::OFileURLControl> m_pSaveAsLocation; + VclPtr<PushButton> m_pBrowseSaveAsLocation; + VclPtr<FixedText> m_pStartMigration; ::svx::DatabaseLocationInputController* m_pLocationController; protected: @@ -101,8 +104,10 @@ namespace dbmm { public: ProgressPage(vcl::Window *pParent); + 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(); @@ -118,13 +123,13 @@ namespace dbmm virtual void setOverallProgressValue( const sal_uInt32 _nValue ) SAL_OVERRIDE; private: - FixedText* m_pObjectCount; - FixedText* m_pCurrentObject; - FixedText* m_pCurrentAction; - RangeProgressBar m_aCurrentProgress; - FixedText* m_pAllProgressText; - RangeProgressBar m_aAllProgress; - FixedText* m_pMigrationDone; + VclPtr<FixedText> m_pObjectCount; + VclPtr<FixedText> m_pCurrentObject; + VclPtr<FixedText> m_pCurrentAction; + RangeProgressBar m_aCurrentProgress; + VclPtr<FixedText> m_pAllProgressText; + RangeProgressBar m_aAllProgress; + VclPtr<FixedText> m_pMigrationDone; }; // ResultPage @@ -132,15 +137,17 @@ namespace dbmm { public: ResultPage(vcl::Window *pParent); + 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 ); private: - FixedText* m_pSuccessLabel; - FixedText* m_pFailureLabel; - VclMultiLineEdit* m_pChanges; + VclPtr<FixedText> m_pSuccessLabel; + VclPtr<FixedText> m_pFailureLabel; + VclPtr<VclMultiLineEdit> m_pChanges; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 5966a9b27e3c..740a337aeca8 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -88,7 +88,7 @@ namespace dbmm virtual ~MacroMigrationDialogService(); protected: - virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; + virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; virtual void destroyDialog() SAL_OVERRIDE; private: @@ -121,9 +121,9 @@ namespace dbmm return *(new MacroMigrationDialogService( _rxContext ) ); } - Dialog* MacroMigrationDialogService::createDialog( vcl::Window* _pParent ) + VclPtr<Dialog> MacroMigrationDialogService::createDialog( vcl::Window* _pParent ) { - return new MacroMigrationDialog( _pParent, m_aContext, m_xDocument ); + return VclPtr<MacroMigrationDialog>::Create( _pParent, m_aContext, m_xDocument ); } void MacroMigrationDialogService::destroyDialog() diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx index 0dde133e7f10..7b5a1a0e1282 100644 --- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx +++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx @@ -65,7 +65,7 @@ namespace dbmm } private: - ProgressBar *m_pBar; + VclPtr<ProgressBar> m_pBar; sal_uInt32 m_nRange; }; |