diff options
author | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 14:45:09 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 14:45:09 +0000 |
commit | 8cef8f6eab3729f396becc52a05c89af9f4274f1 (patch) | |
tree | 5a528257dca9234d9a4585a233736a146daa837a /connectivity | |
parent | cb5882302c1a9c5eb023caf5d134493693da90a2 (diff) |
INTEGRATION: CWS sb41 (1.24.38); FILE MERGED
2005/12/13 09:22:16 sb 1.24.38.1: #i57855# At least for __SUNPRO_CC 0x550, makeAny etc. do not work for some C++ types derived from UNO types.
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/jdbc/ResultSet.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 3523a01a3f3c..73b486d9d49f 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ResultSet.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: rt $ $Date: 2005-09-08 06:12:05 $ + * last change: $Author: rt $ $Date: 2006-01-10 15:45:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1142,7 +1142,9 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc if( out ) { java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); - return makeAny(java_sql_SQLWarning(warn_base,*this)); + return makeAny( + static_cast< starsdbc::SQLException >( + java_sql_SQLWarning(warn_base,*this))); } return ::com::sun::star::uno::Any(); |