summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-11-27 11:24:09 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-11-27 11:24:09 +0000
commit00ec2c9280809be261421685786da65593738ab9 (patch)
tree0a78fc90579c146df6bf434b7d0b25d84ed2afe1
parent68a943fbc08ee05f80452b263b35ecd3fef5be73 (diff)
INTEGRATION: CWS dba24lms (1.7.8); FILE MERGED
2007/11/14 12:52:15 oj 1.7.8.1: #i11746# insert Ignore Currency
-rw-r--r--connectivity/source/drivers/jdbc/JConnection.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 98bb41005482..105e50db26a5 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: JConnection.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: ihi $ $Date: 2007-11-27 12:23:39 $
+ * last change: $Author: ihi $ $Date: 2007-11-27 12:24:09 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -915,7 +915,6 @@ Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeExc
return Any();
}
// -----------------------------------------------------------------------------
-<<<<<<< JConnection.cxx
namespace
{
bool lcl_setSystemProperties_nothrow( const java::sql::ConnectionLog& _rLogger,