diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-20 19:07:31 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-26 23:14:33 +0100 |
| commit | 31170413ae3786bf44564e813d7291354e939a77 (patch) | |
| tree | ca37fdc23fa2d31217433ba9d7bc12fe66be94e9 /pyuno | |
| parent | 1d095efaf989730c298b2ad99720eacf68f71229 (diff) | |
API CHANGE: com.sun.star.lang.IllegalArgumentException
... derives from com.sun.star.uno.RuntimeException instead of
com.sun.star.uno.Exception.
Only test that breaks with this change is jurt_uno/AnyConverter_Test,
which for mysterious reasons effectively tests that
IllegalArgumentException is a subclass of Exception and not
RuntimeException. Presumably this is just a generic exception test that
happens to use IllegalArgumentException.
Some further testing indicates there are no problems expected at
runtime:
Running "make subsequentcheck" with all Java test code compiled against
a ridl.jar that does not contain the change, running against a soffice
that uses ridl.jar and rdbs with the change + ridl.jar with the change
on the test side yields exactly the same AnyConverter_Test failure, with
no other failures.
Change-Id: Iad183de76ec7e0d56648084e97cdcc160b5b033d
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/module/pyuno_adapter.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx index 35b6ce46fe07..2be265fc3945 100644 --- a/pyuno/source/module/pyuno_adapter.cxx +++ b/pyuno/source/module/pyuno_adapter.cxx @@ -323,19 +323,19 @@ Any Adapter::invoke( const OUString &aFunctionName, } throw; } - catch( const RuntimeException & e ) + catch( const IllegalArgumentException & e ) { - if( cargo && isLog( cargo, LogLevel::CALL ) ) + if( isLog( cargo, LogLevel::CALL ) ) { logException( - cargo, "except uno->py[0x" , + cargo, "except uno->py[0x" , mWrappedObject.get(), aFunctionName, &e,getCppuType(&e) ); } throw; } - catch( const CannotConvertException & e ) + catch( const RuntimeException & e ) { - if( isLog( cargo, LogLevel::CALL ) ) + if( cargo && isLog( cargo, LogLevel::CALL ) ) { logException( cargo, "except uno->py[0x" , @@ -343,12 +343,12 @@ Any Adapter::invoke( const OUString &aFunctionName, } throw; } - catch( const IllegalArgumentException & e ) + catch( const CannotConvertException & e ) { if( isLog( cargo, LogLevel::CALL ) ) { logException( - cargo, "except uno->py[0x" , + cargo, "except uno->py[0x" , mWrappedObject.get(), aFunctionName, &e,getCppuType(&e) ); } throw; |