User: ihi Date: 2007-11-27 12:25:51+0000 Modified: dba/dbaccess/source/ui/dlg/DriverSettings.cxx
Log: INTEGRATION: CWS dba24lms (1.9.4); FILE MERGED 2007/11/14 13:29:04 oj 1.9.4.3: #i11746# revert DSL_DOSLINEENDS removeable 2007/11/14 12:39:35 oj 1.9.4.2: #i11746# insert Ignore Currency 2007/11/12 15:20:47 oj 1.9.4.1: #i11746# currency oracle 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.10&r2=1.11 Delta lines: +7 -1 ------------------- --- DriverSettings.cxx 2007-11-21 16:59:23+0000 1.10 +++ DriverSettings.cxx 2007-11-27 12:25:49+0000 1.11 @@ -121,9 +121,9 @@ _out_rDetailsIds.push_back(DSID_CONN_LDAP_BASEDN); _out_rDetailsIds.push_back(DSID_CONN_LDAP_ROWCOUNT); _out_rDetailsIds.push_back(DSID_CONN_LDAP_USESSL); - _out_rDetailsIds.push_back(DSID_DOSLINEENDS); break; +<<<<<<< DriverSettings.cxx case DST_MOZILLA: case DST_THUNDERBIRD: case DST_EVOLUTION: @@ -134,8 +134,14 @@ break; case DST_JDBC: +======= + case DST_JDBC: + _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); + break; +>>>>>>> 1.9.4.3 case DST_ORACLE_JDBC: _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS); + _out_rDetailsIds.push_back(DSID_IGNORECURRENCY); break; default: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
