diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx')
-rw-r--r-- | dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 138 |
1 files changed, 74 insertions, 64 deletions
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 4756b6c75b57..109c3f3c93d3 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -40,12 +40,13 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static VclPtr<OGenericAdministrationPage> CreateSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OSpreadSheetConnectionPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); + virtual ~OSpreadSheetConnectionPageSetup(); + virtual void dispose() SAL_OVERRIDE; protected: - CheckBox *m_pPasswordrequired; - virtual ~OSpreadSheetConnectionPageSetup(); + VclPtr<CheckBox> m_pPasswordrequired; protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; @@ -58,14 +59,14 @@ namespace dbaui class OTextConnectionPageSetup : public OConnectionTabPageSetup { public: + VclPtr<OTextConnectionHelper> m_pTextConnectionHelper; + virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateTextTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static VclPtr<OGenericAdministrationPage> CreateTextTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OTextConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); - OTextConnectionHelper* m_pTextConnectionHelper; - private: - - protected: virtual ~OTextConnectionPageSetup(); + virtual void dispose() SAL_OVERRIDE; + protected: virtual bool prepareLeave() SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -81,8 +82,10 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateLDAPTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static VclPtr<OGenericAdministrationPage> CreateLDAPTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); + virtual ~OLDAPConnectionPageSetup(); + virtual void dispose() SAL_OVERRIDE; virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } protected: @@ -92,28 +95,30 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); private: - FixedText* m_pFTHelpText; - FixedText* m_pFTHostServer; - Edit* m_pETHostServer; - FixedText* m_pFTBaseDN; - Edit* m_pETBaseDN; - FixedText* m_pFTPortNumber; - NumericField* m_pNFPortNumber; - FixedText* m_pFTDefaultPortNumber; - CheckBox* m_pCBUseSSL; + VclPtr<FixedText> m_pFTHelpText; + VclPtr<FixedText> m_pFTHostServer; + VclPtr<Edit> m_pETHostServer; + VclPtr<FixedText> m_pFTBaseDN; + VclPtr<Edit> m_pETBaseDN; + VclPtr<FixedText> m_pFTPortNumber; + VclPtr<NumericField> m_pNFPortNumber; + VclPtr<FixedText> m_pFTDefaultPortNumber; + VclPtr<CheckBox> m_pCBUseSSL; }; // MySQLNativeSetupPage class MySQLNativeSetupPage : public OGenericAdministrationPage { private: - FixedText *m_pHelpText; - MySQLNativeSettings m_aMySQLSettings; + VclPtr<FixedText> m_pHelpText; + 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 ); + static VclPtr<OGenericAdministrationPage> Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE; @@ -139,8 +144,10 @@ namespace dbaui , sal_uInt16 _nHelpTextResId , sal_uInt16 _nHeaderTextResId , sal_uInt16 _nDriverClassId ); - static OGenericAdministrationPage* CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + virtual ~OGeneralSpecialJDBCConnectionPageSetup(); + virtual void dispose() SAL_OVERRIDE; + static VclPtr<OGenericAdministrationPage> CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static VclPtr<OGenericAdministrationPage> CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; @@ -151,19 +158,19 @@ namespace dbaui DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); - FixedText* m_pHeaderText; - FixedText* m_pFTHelpText; - FixedText* m_pFTDatabasename; - Edit* m_pETDatabasename; - FixedText* m_pFTHostname; - Edit* m_pETHostname; - FixedText* m_pFTPortNumber; - FixedText* m_pFTDefaultPortNumber; - NumericField* m_pNFPortNumber; - - FixedText* m_pFTDriverClass; - Edit* m_pETDriverClass; - PushButton* m_pPBTestJavaDriver; + VclPtr<FixedText> m_pHeaderText; + VclPtr<FixedText> m_pFTHelpText; + VclPtr<FixedText> m_pFTDatabasename; + VclPtr<Edit> m_pETDatabasename; + VclPtr<FixedText> m_pFTHostname; + VclPtr<Edit> m_pETHostname; + VclPtr<FixedText> m_pFTPortNumber; + VclPtr<FixedText> m_pFTDefaultPortNumber; + VclPtr<NumericField> m_pNFPortNumber; + + VclPtr<FixedText> m_pFTDriverClass; + VclPtr<Edit> m_pETDriverClass; + VclPtr<PushButton> m_pPBTestJavaDriver; OUString m_sDefaultJdbcDriverName; sal_uInt16 m_nPortId; @@ -174,7 +181,9 @@ namespace dbaui { public: OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + virtual ~OJDBCConnectionPageSetup(); + virtual void dispose() SAL_OVERRIDE; + static VclPtr<OGenericAdministrationPage> CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual bool checkTestConnection() SAL_OVERRIDE; @@ -186,9 +195,9 @@ namespace dbaui DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); - FixedText* m_pFTDriverClass; - Edit* m_pETDriverClass; - PushButton* m_pPBTestJavaDriver; + VclPtr<FixedText> m_pFTDriverClass; + VclPtr<Edit> m_pETDriverClass; + VclPtr<PushButton> m_pPBTestJavaDriver; }; // OJDBCConnectionPageSetup @@ -203,8 +212,10 @@ namespace dbaui }; OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); + virtual ~OMySQLIntroPageSetup(); + virtual void dispose() SAL_OVERRIDE; - static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ); + static VclPtr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ); ConnectionType getMySQLMode(); Link maClickHdl; void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } @@ -216,12 +227,11 @@ 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; - RadioButton *m_pJDBCDatabase; - RadioButton *m_pNATIVEDatabase; + VclPtr<RadioButton> m_pODBCDatabase; + VclPtr<RadioButton> m_pJDBCDatabase; + VclPtr<RadioButton> m_pNATIVEDatabase; DECL_LINK(OnSetupModeSelected, RadioButton*); @@ -232,16 +242,17 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateAuthentificationTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static VclPtr<OGenericAdministrationPage> CreateAuthentificationTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); OAuthentificationPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); + virtual ~OAuthentificationPageSetup(); + virtual void dispose() SAL_OVERRIDE; protected: - FixedText* m_pFTHelpText; - FixedText* m_pFTUserName; - Edit* m_pETUserName; - CheckBox* m_pCBPasswordRequired; - PushButton* m_pPBTestConnection; - virtual ~OAuthentificationPageSetup(); + VclPtr<FixedText> m_pFTHelpText; + VclPtr<FixedText> m_pFTUserName; + VclPtr<Edit> m_pETUserName; + VclPtr<CheckBox> m_pCBPasswordRequired; + VclPtr<PushButton> m_pPBTestConnection; protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; @@ -254,18 +265,20 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet); + static VclPtr<OGenericAdministrationPage> CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet); - FixedText* m_pFTFinalHeader; - FixedText* m_pFTFinalHelpText; - RadioButton* m_pRBRegisterDataSource; - RadioButton* m_pRBDontregisterDataSource; - FixedText* m_pFTAdditionalSettings; - CheckBox* m_pCBOpenAfterwards; - CheckBox* m_pCBStartTableWizard; - FixedText* m_pFTFinalText; + VclPtr<FixedText> m_pFTFinalHeader; + VclPtr<FixedText> m_pFTFinalHelpText; + VclPtr<RadioButton> m_pRBRegisterDataSource; + VclPtr<RadioButton> m_pRBDontregisterDataSource; + VclPtr<FixedText> m_pFTAdditionalSettings; + VclPtr<CheckBox> m_pCBOpenAfterwards; + VclPtr<CheckBox> m_pCBStartTableWizard; + VclPtr<FixedText> m_pFTFinalText; OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); + virtual ~OFinalDBPageSetup(); + virtual void dispose() SAL_OVERRIDE; bool IsDatabaseDocumentToBeRegistered(); bool IsDatabaseDocumentToBeOpened(); bool IsTableWizardToBeStarted(); @@ -276,9 +289,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; |