summaryrefslogtreecommitdiff
path: root/connectivity/source/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-25 15:39:47 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-10-25 16:56:17 +0100
commit9e965e9b15be7674a4b7b787370018fbd60e339e (patch)
treeabfa4943c3e6a00d25af3c0e92275f1d9afd9d3e /connectivity/source/inc
parent7c896697f29730476ea0fc4517d94c2c8e8b2074 (diff)
coverity#706319 Uncaught exception
Change-Id: I7f390151c232d0a96d50b16c0c76aacea569653e
Diffstat (limited to 'connectivity/source/inc')
-rw-r--r--connectivity/source/inc/java/lang/Object.hxx22
-rw-r--r--connectivity/source/inc/java/sql/DatabaseMetaData.hxx4
2 files changed, 13 insertions, 13 deletions
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 0d524aeb1893..190433427624 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -115,19 +115,19 @@ namespace connectivity
bool callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const;
bool callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
jobject callResultSetMethod( JNIEnv& _rEnv, const char* _pMethodName, jmethodID& _inout_MethodID ) const;
- sal_Int32 callIntMethod_Throw(const char* _pMethodName, jmethodID& _inout_MethodID) const;
- sal_Int32 callIntMethod_Nothrow(const char* _pMethodName, jmethodID& _inout_MethodID) const;
- sal_Int32 callIntMethodWithIntArg_Throw( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
- sal_Int32 callIntMethodWithIntArg_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
+ sal_Int32 callIntMethod_ThrowSQL(const char* _pMethodName, jmethodID& _inout_MethodID) const;
+ sal_Int32 callIntMethod_ThrowRuntime(const char* _pMethodName, jmethodID& _inout_MethodID) const;
+ sal_Int32 callIntMethodWithIntArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
+ sal_Int32 callIntMethodWithIntArg_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
sal_Int32 callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const;
OUString callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const;
OUString callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const;
- void callVoidMethod_Throw( const char* _pMethodName, jmethodID& _inout_MethodID) const;
- void callVoidMethod_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID) const;
- void callVoidMethodWithIntArg_Throw( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
- void callVoidMethodWithIntArg_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
- void callVoidMethodWithBoolArg_Throw( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const;
- void callVoidMethodWithBoolArg_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const;
+ void callVoidMethod_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID) const;
+ void callVoidMethod_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID) const;
+ void callVoidMethodWithIntArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
+ void callVoidMethodWithIntArg_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const;
+ void callVoidMethodWithBoolArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const;
+ void callVoidMethodWithBoolArg_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const;
void callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID, const OUString& _nArgument ) const;
jobject callObjectMethod( JNIEnv * pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID ) const;
jobject callObjectMethodWithIntArg( JNIEnv * pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const;
@@ -143,7 +143,7 @@ namespace connectivity
}
template< typename T >
- void callVoidMethod_Throw(const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID,sal_Int32 _nArgument, const T& _aValue) const
+ void callVoidMethod_ThrowSQL(const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID,sal_Int32 _nArgument, const T& _aValue) const
{
SDBThreadAttach t;
obtainMethodId_throwSQL(t.pEnv, _pMethodName,_pSignature, _inout_MethodID);
diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
index bd704a8d1da5..7a8105ae8932 100644
--- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
+++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
@@ -202,8 +202,8 @@ namespace connectivity
private:
bool impl_callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID );
OUString impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID );
- sal_Int32 impl_callIntMethod_Throw( const char* _pMethodName, jmethodID& _inout_MethodID );
- sal_Int32 impl_callIntMethod_Nothrow( const char* _pMethodName, jmethodID& _inout_MethodID );
+ sal_Int32 impl_callIntMethod_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID );
+ sal_Int32 impl_callIntMethod_ThrowRuntime( const char* _pMethodName, jmethodID& _inout_MethodID );
bool impl_callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument );
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
impl_callResultSetMethod( const char* _pMethodName, jmethodID& _inout_MethodID );