User: kz Date: 2006/12/13 08:48:40 Modified: dba/dbaccess/source/ui/dlg/DriverSettings.cxx
Log: INTEGRATION: CWS dba22ui (1.6.12); FILE MERGED 2006/12/05 09:47:54 fs 1.6.12.1: copying the fix for #i72252# from CWS dba22b to dba22ui - intended for the latter, but wrongly checked in into the former File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: DriverSettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DriverSettings.cxx?r1=1.6&r2=1.7 Delta lines: +21 -8 -------------------- --- DriverSettings.cxx 17 Sep 2006 07:05:44 -0000 1.6 +++ DriverSettings.cxx 13 Dec 2006 16:48:37 -0000 1.7 @@ -66,6 +66,7 @@ _rDetailsIds.push_back(DSID_SQL92CHECK); _rDetailsIds.push_back(DSID_DOSLINEENDS); break; + case DST_MSACCESS: _rDetailsIds.push_back(DSID_SQL92CHECK); _rDetailsIds.push_back(DSID_ENABLEOUTERJOIN); @@ -73,6 +74,7 @@ _rDetailsIds.push_back(DSID_BOOLEANCOMPARISON); _rDetailsIds.push_back(DSID_DOSLINEENDS); break; + case DST_ADABAS: _rDetailsIds.push_back(DSID_CHARSET); _rDetailsIds.push_back(DSID_SQL92CHECK); @@ -93,6 +95,7 @@ _rDetailsIds.push_back(DSID_SUPPRESSVERSIONCL); _rDetailsIds.push_back(DSID_ENABLEOUTERJOIN); _rDetailsIds.push_back(DSID_APPEND_TABLE_ALIAS); + _rDetailsIds.push_back(DSID_AS_BEFORE_CORRNAME); _rDetailsIds.push_back(DSID_BOOLEANCOMPARISON); _rDetailsIds.push_back(DSID_DOSLINEENDS); break; @@ -110,6 +113,7 @@ _rDetailsIds.push_back(DSID_CATALOG); _rDetailsIds.push_back(DSID_SCHEMA); _rDetailsIds.push_back(DSID_APPEND_TABLE_ALIAS); + _rDetailsIds.push_back(DSID_AS_BEFORE_CORRNAME); _rDetailsIds.push_back(DSID_BOOLEANCOMPARISON); _rDetailsIds.push_back(DSID_IGNOREDRIVER_PRIV); _rDetailsIds.push_back(DSID_INDEXAPPENDIX); @@ -127,6 +131,7 @@ _rDetailsIds.push_back(DSID_IGNOREDRIVER_PRIV); _rDetailsIds.push_back(DSID_DOSLINEENDS); break; + case DST_MYSQL_ODBC: _rDetailsIds.push_back(DSID_CHARSET); _rDetailsIds.push_back(DSID_SUPPRESSVERSIONCL); @@ -137,6 +142,7 @@ _rDetailsIds.push_back(DSID_IGNOREDRIVER_PRIV); _rDetailsIds.push_back(DSID_DOSLINEENDS); break; + case DST_LDAP: _rDetailsIds.push_back(DSID_CONN_LDAP_BASEDN); _rDetailsIds.push_back(DSID_CONN_LDAP_ROWCOUNT); @@ -157,9 +163,11 @@ case DST_OUTLOOK: _rDetailsIds.push_back(DSID_DOSLINEENDS); break; + case DST_OUTLOOKEXP: _rDetailsIds.push_back(DSID_DOSLINEENDS); break; + case DST_JDBC: _rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); _rDetailsIds.push_back(DSID_SQL92CHECK); @@ -173,10 +181,12 @@ _rDetailsIds.push_back(DSID_CATALOG); _rDetailsIds.push_back(DSID_SCHEMA); _rDetailsIds.push_back(DSID_APPEND_TABLE_ALIAS); + _rDetailsIds.push_back(DSID_AS_BEFORE_CORRNAME); _rDetailsIds.push_back(DSID_BOOLEANCOMPARISON); _rDetailsIds.push_back(DSID_INDEXAPPENDIX); _rDetailsIds.push_back(DSID_DOSLINEENDS); break; + case DST_ORACLE_JDBC: _rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); _rDetailsIds.push_back(DSID_SQL92CHECK); @@ -190,10 +200,12 @@ _rDetailsIds.push_back(DSID_CATALOG); _rDetailsIds.push_back(DSID_SCHEMA); _rDetailsIds.push_back(DSID_APPEND_TABLE_ALIAS); + _rDetailsIds.push_back(DSID_AS_BEFORE_CORRNAME); _rDetailsIds.push_back(DSID_BOOLEANCOMPARISON); _rDetailsIds.push_back(DSID_INDEXAPPENDIX); _rDetailsIds.push_back(DSID_DOSLINEENDS); break; + case DST_USERDEFINE1: /// first user defined driver case DST_USERDEFINE2: case DST_USERDEFINE3: @@ -218,6 +230,7 @@ _rDetailsIds.push_back(DSID_CATALOG); _rDetailsIds.push_back(DSID_SCHEMA); _rDetailsIds.push_back(DSID_APPEND_TABLE_ALIAS); + _rDetailsIds.push_back(DSID_AS_BEFORE_CORRNAME); _rDetailsIds.push_back(DSID_BOOLEANCOMPARISON); _rDetailsIds.push_back(DSID_INDEXAPPENDIX); _rDetailsIds.push_back(DSID_IGNOREDRIVER_PRIV); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
