diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-16 07:31:09 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-16 07:31:09 +0000 |
| commit | b5345a6f8629478c9e543c494063bfec51ddbf74 (patch) | |
| tree | c95338ebbc74ec5f2472a815b3d2f876134d81bb /dbaccess/source/ui/dlg/ConnectionHelper.hxx | |
| parent | caa3bf5c34c08e5e93a03deb3064792139f030bb (diff) | |
CWS-TOOLING: integrate CWS mysql1
2009-01-29 13:25:23 +0100 fs r267126 : #i98559#
2009-01-29 10:29:23 +0100 fs r267100 : #i98559#
2009-01-29 09:56:20 +0100 fs r267098 : do not display empty schematas in the table list in the query designer
2009-01-29 09:40:28 +0100 fs r267097 : corrected acceptsURL
2009-01-28 11:17:42 +0100 fs r267042 : display empty catalogs/schemas, if indicated by the connection settings
2009-01-28 11:14:30 +0100 fs r267040 : +displayEmptyTableFolders
2009-01-28 11:03:28 +0100 fs r267036 : mysql:mysqlc, not mysql:mysql, for the native driver
2009-01-28 10:23:53 +0100 fs r267031 : select the first catalog/schema, if the guess for the current one did not match
2009-01-28 10:22:23 +0100 fs r267030 : select the first catalog/schema, if the guess for the current one did not match
2009-01-27 15:03:29 +0100 fs r266996 : #i10000#
2009-01-27 14:56:13 +0100 fs r266992 : #i20563# better (more dedicated) UI for the MySQL native driver's properties
2009-01-27 08:20:24 +0100 oj r266953 : enable sdbcx mysql driver for mysqlc
2009-01-27 08:20:09 +0100 oj r266952 : enable sdbcx mysql driver for mysqlc
Diffstat (limited to 'dbaccess/source/ui/dlg/ConnectionHelper.hxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/ConnectionHelper.hxx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index c25751960648..cb9e4ff19816 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -75,7 +75,7 @@ namespace dbaui OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs); virtual ~OConnectionHelper(); FixedText m_aFT_Connection; - OConnectionURLEdit m_aET_Connection; + OConnectionURLEdit m_aConnectionURL; PushButton m_aPB_Connection; ::dbaccess::DATASOURCE_TYPE m_eType; // the type can't be changed in this class, so we hold it as member. @@ -96,8 +96,8 @@ namespace dbaui // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes - String getURL( OConnectionURLEdit* _m_pConnection ) const; - void setURL( const String& _rURL, OConnectionURLEdit* _m_pConnection ); + //String getURL( OConnectionURLEdit* _m_pConnection ) const; + //void setURL( const String& _rURL, OConnectionURLEdit* _m_pConnection ); String getURLNoPrefix( ) const; void setURLNoPrefix( const String& _rURL ); @@ -122,19 +122,20 @@ namespace dbaui virtual void SetServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB) { OGenericAdministrationPage::SetServiceFactory(_rxORB); - m_aET_Connection.initializeTypeCollection(m_xORB); + m_aConnectionURL.initializeTypeCollection(m_xORB); } protected: + void setURL( const String& _rURL ); + virtual bool checkTestConnection(); + + private: DECL_LINK(OnBrowseConnections, PushButton*); - void setURL( const String& _rURL ); - String implGetURL( sal_Bool _bPrefix ) const; - void implSetURL( const String& _rURL, sal_Bool _bPrefix ); - StringBag getInstalledAdabasDBDirs(const String &_rPath,const ::ucbhelper::ResultSetInclude& _reResultSetInclude); - StringBag getInstalledAdabasDBs(const String &_rConfigDir,const String &_rWorkDir); - virtual bool checkTestConnection(); - - void implUpdateURLDependentStates() const; + StringBag getInstalledAdabasDBDirs(const String &_rPath,const ::ucbhelper::ResultSetInclude& _reResultSetInclude); + StringBag getInstalledAdabasDBs(const String &_rConfigDir,const String &_rWorkDir); + String impl_getURL( sal_Bool _bPrefix ) const; + void impl_setURL( const String& _rURL, sal_Bool _bPrefix ); + void implUpdateURLDependentStates() const; }; //......................................................................... |