diff options
author | Release Engineers <releng@openoffice.org> | 2009-07-03 12:24:35 +0000 |
---|---|---|
committer | Release Engineers <releng@openoffice.org> | 2009-07-03 12:24:35 +0000 |
commit | b88a62cc97613e5dc00c806f59982cb57f9d1dc8 (patch) | |
tree | eabae32ce7ef5ab6e287e76f6d67558d39f279e6 /dbaccess/source/ui/dlg/DriverSettings.cxx | |
parent | c07293ca06f80aecc48203a5c56bae1235abe88d (diff) |
CWS-TOOLING: integrate CWS dbaperf2
2009-06-22 11:04:36 +0200 msc r273202 : #100000# fix to run this test
2009-06-22 09:41:04 +0200 msc r273200 : #100000# correct case
2009-06-22 09:02:42 +0200 msc r273199 : new SRB
2009-06-22 08:53:26 +0200 msc r273198 : #100000
2009-06-15 12:36:32 +0200 oj r272976 : test
2009-06-12 14:23:23 +0200 msc r272918 : #101587# unused feature was removed
2009-06-12 06:45:17 +0200 oj r272903 : use GUI instead of OS
2009-06-11 09:12:30 +0200 oj r272845 : remove unused dep
2009-06-11 09:11:09 +0200 oj r272844 : ColumnAliasInOrderBy not supported
2009-06-11 08:27:00 +0200 oj r272843 : CWS-TOOLING: rebase CWS dbaperf2 to trunk@272827 (milestone: DEV300:m50)
2009-06-10 15:30:17 +0200 msc r272822 : #100000
2009-06-10 15:27:40 +0200 msc r272820 : #102515# new function for the database type list
2009-06-10 15:26:09 +0200 msc r272818 : move file to dbaccess/tools/dbcreatetools.inc
2009-06-10 15:20:10 +0200 msc r272816 : #102515# new function for the database type list
2009-06-10 12:34:46 +0200 oj r272803 : #i101587# check extension
2009-06-10 11:53:45 +0200 oj r272800 : remove unused code
2009-06-09 09:57:25 +0200 oj r272752 : #i101587# EscapeDateTime moved into features section
2009-06-09 09:56:26 +0200 oj r272751 : enable finish
2009-06-08 11:50:37 +0200 oj r272726 : #i102588# move convert tzo saveDataSource
2009-06-05 11:54:20 +0200 jsk r272676 : #i102515# - NEW: Functions to retrieve Database names from API
2009-06-05 10:52:22 +0200 jsk r272671 : NEW: Functions to retrieve Database names from API
2009-06-05 09:36:54 +0200 oj r272666 : handle win and unx differently
2009-06-05 09:36:28 +0200 oj r272665 : handle win and unx differently
2009-06-04 13:41:56 +0200 oj r272625 : #i101268# make use of stringbuffer instead of oustring
2009-06-04 10:18:14 +0200 oj r272612 : add SAL_DLLPUBLIC_EXPORT
2009-05-28 10:56:33 +0200 oj r272381 : #i101587# create langpacks
2009-05-28 10:41:59 +0200 oj r272380 : #i101587# create langpacks
2009-05-28 10:29:30 +0200 oj r272379 : #i101587# create langpacks
2009-05-07 10:11:46 +0200 oj r271635 : fix compile warnings
2009-05-07 07:01:31 +0200 oj r271619 : change type from int32 to PathID
2009-05-07 06:53:19 +0200 oj r271618 : add all
2009-05-06 14:57:02 +0200 oj r271595 : add missing lib
2009-05-06 14:56:54 +0200 oj r271594 : no used anymore
2009-05-06 14:56:08 +0200 oj r271593 : no used anymore
2009-05-06 14:54:25 +0200 oj r271592 : no used anymore
2009-05-06 14:45:59 +0200 oj r271591 : add missing lib
2009-05-06 14:41:54 +0200 oj r271590 : change wnt
2009-05-06 14:22:21 +0200 oj r271589 : #i101587# use config for the drivers
2009-05-06 14:21:39 +0200 oj r271588 : #i101587# add new set for metadata and config data for driver
2009-05-06 14:19:36 +0200 oj r271587 : #i101587# handle metadata and props of driver
2009-05-06 10:11:11 +0200 oj r271570 : #i101587# correct wrong use of reference
2009-05-06 09:24:33 +0200 oj r271567 : #i101587# add new set for metadata
2009-05-06 08:52:06 +0200 oj r271563 : #i101587# add driver configuration
2009-05-06 08:51:04 +0200 oj r271562 : #i101587# add driver configuration
2009-05-04 10:24:41 +0200 oj r271442 : CWS-TOOLING: rebase CWS dbaperf2 to trunk@271427 (milestone: DEV300:m47)
2009-04-28 07:06:22 +0200 oj r271303 : compile error
2009-04-27 14:12:48 +0200 oj r271270 : #i101268# make use of stringbuffer instead of oustring
2009-04-27 14:12:27 +0200 oj r271269 : #i101268# make use of stringbuffer instead of oustring
2009-04-27 09:30:10 +0200 oj r271255 : use string buffer when possible
2009-04-24 11:56:01 +0200 oj r271207 : #i101268# remove end() call from loop
2009-04-23 14:24:03 +0200 oj r271171 : add dep
2009-04-23 13:25:25 +0200 oj r271164 : #i101268# add config entries for database drivers
2009-04-23 13:07:13 +0200 oj r271161 : #i101268# add config entries for database drivers
2009-04-23 13:06:33 +0200 oj r271160 : #i101268# add parent url pattern entry for driver node
2009-04-23 13:05:39 +0200 oj r271159 : #i101268# add config entry for driver node
2009-04-23 13:04:09 +0200 oj r271157 : #i101268# add config entry for driver node
2009-04-23 06:41:32 +0200 oj r271142 : #i101268# add new configuration file Drivers
2009-04-22 13:49:19 +0200 oj r271103 : convert EOL
2009-04-22 13:29:17 +0200 oj r271101 : #i101268# use of driver configuration entries for features and properties
2009-04-22 13:28:08 +0200 oj r271100 : #i101268# use of driver configuration entries for features and properties
2009-04-22 13:15:26 +0200 oj r271098 : #i101268# add new configuration file Drivers
2009-04-22 13:14:43 +0200 oj r271097 : #i101268# use of driver configuration entries for features and properties
Diffstat (limited to 'dbaccess/source/ui/dlg/DriverSettings.cxx')
-rw-r--r-- | dbaccess/source/ui/dlg/DriverSettings.cxx | 101 |
1 files changed, 33 insertions, 68 deletions
diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index 15c40b3e40c5..4c66109d50e2 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -34,14 +34,15 @@ #include "DriverSettings.hxx" #include "dsitems.hxx" #include "datasourceui.hxx" - +#include <connectivity/DriversConfig.hxx> using namespace dbaui; -void ODriversSettings::getSupportedIndirectSettings( ::dbaccess::DATASOURCE_TYPE _eType, ::std::vector< sal_Int32>& _out_rDetailsIds ) +void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory, ::std::vector< sal_Int32>& _out_rDetailsIds ) { // for a number of settings, we do not need to use hard-coded here, but can ask a // central DataSourceUI instance. - DataSourceUI aDSUI( _eType ); + DataSourceMetaData aMeta(_sURLPrefix); + DataSourceUI aDSUI( aMeta ); const USHORT nGenericKnownSettings[] = { DSID_SQL92CHECK, @@ -67,71 +68,35 @@ void ODriversSettings::getSupportedIndirectSettings( ::dbaccess::DATASOURCE_TYPE _out_rDetailsIds.push_back( *pGenericKnowSetting ); // the rest is hard-coded. On the long run, all of this should be done via DataSourceUI::hasSetting - switch ( _eType ) + ::connectivity::DriversConfig aDriverConfig(_xFactory); + const ::comphelper::NamedValueCollection& aProperties = aDriverConfig.getProperties(_sURLPrefix); + typedef ::std::pair<USHORT, ::rtl::OUString> TProperties; + TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowDeleted"))) + ,TProperties(DSID_CHARSET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet"))) + ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldDelimiter"))) + ,TProperties(DSID_TEXTDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StringDelimiter"))) + ,TProperties(DSID_DECIMALDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalDelimiter"))) + ,TProperties(DSID_THOUSANDSDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ThousandDelimiter"))) + ,TProperties(DSID_TEXTFILEEXTENSION,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extension"))) + ,TProperties(DSID_TEXTFILEHEADER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderLine"))) + ,TProperties(DSID_ADDITIONALOPTIONS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SystemDriverSettings"))) + ,TProperties(DSID_CONN_SHUTSERVICE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShutdownDatabase"))) + ,TProperties(DSID_CONN_DATAINC,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSizeIncrement"))) + ,TProperties(DSID_CONN_CACHESIZE,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSize"))) + ,TProperties(DSID_CONN_CTRLUSER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlUser"))) + ,TProperties(DSID_CONN_CTRLPWD,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlPassword"))) + ,TProperties(DSID_USECATALOG,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalog"))) + ,TProperties(DSID_CONN_SOCKET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalSocket"))) + ,TProperties(DSID_JDBCDRIVERCLASS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass"))) + ,TProperties(DSID_CONN_LDAP_BASEDN,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN"))) + ,TProperties(DSID_CONN_LDAP_ROWCOUNT,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRowCount"))) + ,TProperties(DSID_CONN_LDAP_USESSL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSSL"))) + ,TProperties(DSID_IGNORECURRENCY,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreCurrency"))) + ,TProperties(0,::rtl::OUString()) + }; + for ( TProperties* pProps = aProps; pProps->first; ++pProps ) { - case ::dbaccess::DST_DBASE: - _out_rDetailsIds.push_back(DSID_SHOWDELETEDROWS); - _out_rDetailsIds.push_back(DSID_CHARSET); - break; - - case ::dbaccess::DST_FLAT: - _out_rDetailsIds.push_back(DSID_FIELDDELIMITER); - _out_rDetailsIds.push_back(DSID_TEXTDELIMITER); - _out_rDetailsIds.push_back(DSID_DECIMALDELIMITER); - _out_rDetailsIds.push_back(DSID_THOUSANDSDELIMITER); - _out_rDetailsIds.push_back(DSID_TEXTFILEEXTENSION); - _out_rDetailsIds.push_back(DSID_TEXTFILEHEADER); - _out_rDetailsIds.push_back(DSID_CHARSET); - break; - - case ::dbaccess::DST_ADABAS: - _out_rDetailsIds.push_back(DSID_CHARSET); - _out_rDetailsIds.push_back(DSID_CONN_SHUTSERVICE); - _out_rDetailsIds.push_back(DSID_CONN_DATAINC); - _out_rDetailsIds.push_back(DSID_CONN_CACHESIZE); - _out_rDetailsIds.push_back(DSID_CONN_CTRLUSER); - _out_rDetailsIds.push_back(DSID_CONN_CTRLPWD); - break; - - case ::dbaccess::DST_ADO: - _out_rDetailsIds.push_back(DSID_CHARSET); - break; - - case ::dbaccess::DST_ODBC: - _out_rDetailsIds.push_back(DSID_ADDITIONALOPTIONS); - _out_rDetailsIds.push_back(DSID_CHARSET); - _out_rDetailsIds.push_back(DSID_USECATALOG); - break; - - case ::dbaccess::DST_MYSQL_NATIVE: - _out_rDetailsIds.push_back(DSID_CHARSET); - _out_rDetailsIds.push_back(DSID_CONN_SOCKET); - break; - case ::dbaccess::DST_MYSQL_JDBC: - _out_rDetailsIds.push_back(DSID_CHARSET); - _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); - break; - - case ::dbaccess::DST_MYSQL_ODBC: - _out_rDetailsIds.push_back(DSID_CHARSET); - break; - - case ::dbaccess::DST_LDAP: - _out_rDetailsIds.push_back(DSID_CONN_LDAP_BASEDN); - _out_rDetailsIds.push_back(DSID_CONN_LDAP_ROWCOUNT); - _out_rDetailsIds.push_back(DSID_CONN_LDAP_USESSL); - break; - - case ::dbaccess::DST_JDBC: - _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); - break; - - case ::dbaccess::DST_ORACLE_JDBC: - _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); - _out_rDetailsIds.push_back(DSID_IGNORECURRENCY); - break; - - default: - break; + if ( aProperties.has(pProps->second) ) + _out_rDetailsIds.push_back(pProps->first); } } |