diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-16 15:29:28 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 21:34:32 +0100 |
| commit | 97eacd1d5581395de8801e5ba962044132575218 (patch) | |
| tree | 05d4996a45cfd479e16f8bfacf33d7b40b5d368b /dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | |
| parent | 7f7617765cf1f4a16022f47fedb018bf49802a08 (diff) | |
vcl: VclPtr conversion in dbaccess
Change-Id: I85fce0403121ffe55204d78445e4809960ec404a
Diffstat (limited to 'dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 4756b6c75b57..3b3ed06b8bd5 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -45,7 +45,6 @@ namespace dbaui protected: CheckBox *m_pPasswordrequired; - virtual ~OSpreadSheetConnectionPageSetup(); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; @@ -66,6 +65,7 @@ namespace dbaui protected: virtual ~OTextConnectionPageSetup(); + virtual void dispose() SAL_OVERRIDE; virtual bool prepareLeave() SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -108,10 +108,12 @@ namespace dbaui { private: FixedText *m_pHelpText; - MySQLNativeSettings m_aMySQLSettings; + VclPtr<MySQLNativeSettings> m_aMySQLSettings; public: MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs ); + virtual ~MySQLNativeSetupPage(); + virtual void dispose() SAL_OVERRIDE; static OGenericAdministrationPage* Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); @@ -216,7 +218,6 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual ~OMySQLIntroPageSetup(); private: RadioButton *m_pODBCDatabase; @@ -241,7 +242,6 @@ namespace dbaui Edit* m_pETUserName; CheckBox* m_pCBPasswordRequired; PushButton* m_pPBTestConnection; - virtual ~OAuthentificationPageSetup(); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; @@ -276,9 +276,6 @@ namespace dbaui DECL_LINK(OnOpenSelected, CheckBox*); protected: - virtual ~OFinalDBPageSetup(); - - protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; |