User: ihi Date: 2007-11-27 12:26:54+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.11&r2=1.12 Delta lines: +0 -4 ------------------- --- DriverSettings.cxx 2007-11-27 12:25:49+0000 1.11 +++ DriverSettings.cxx 2007-11-27 12:26:52+0000 1.12 @@ -123,7 +123,6 @@ _out_rDetailsIds.push_back(DSID_CONN_LDAP_USESSL); break; -<<<<<<< DriverSettings.cxx case DST_MOZILLA: case DST_THUNDERBIRD: case DST_EVOLUTION: @@ -134,11 +133,8 @@ 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); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
