Tag: cws_src680_dba24b User: oj Date: 2007-09-28 11:14:12+0000 Modified: dba/connectivity/source/drivers/jdbc/JConnection.cxx
Log: RESYNC: (1.5-1.6); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: JConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JConnection.cxx?r1=1.5.26.1&r2=1.5.26.2 Delta lines: +17 -6 -------------------- --- JConnection.cxx 2007-08-31 09:21:59+0000 1.5.26.1 +++ JConnection.cxx 2007-09-28 11:14:10+0000 1.5.26.2 @@ -63,6 +63,9 @@ #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> #endif +#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_ +#include <com/sun/star/sdbc/SQLWarning.hpp> +#endif #ifndef _CONNECTIVITY_SQLPARSE_HXX #include "connectivity/sqlparse.hxx" #endif @@ -797,9 +800,17 @@ if( out ) { java_sql_SQLWarning_BASE warn_base(t.pEnv, out); - return makeAny( - static_cast< starsdbc::SQLException >( - java_sql_SQLWarning(warn_base,*this))); + SQLException aAsException( static_cast< starsdbc::SQLException >( java_sql_SQLWarning( warn_base, *this ) ) ); + + // translate to warning + SQLWarning aWarning; + aWarning.Context = aAsException.Context; + aWarning.Message = aAsException.Message; + aWarning.SQLState = aAsException.SQLState; + aWarning.ErrorCode = aAsException.ErrorCode; + aWarning.NextException = aAsException.NextException; + + return makeAny( aWarning ); } return Any(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
