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 /ucb | |
| 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 'ucb')
| -rw-r--r-- | ucb/source/ucp/hierarchy/hierarchydata.cxx | 8 | ||||
| -rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 75665a918e74..7fbae5c73d1e 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -448,10 +448,6 @@ sal_Bool HierarchyEntry::setData( } } } - catch ( uno::RuntimeException const & ) - { - throw; - } catch ( lang::IllegalArgumentException const & ) { // replaceByName, insertByName @@ -459,6 +455,10 @@ sal_Bool HierarchyEntry::setData( OSL_FAIL( "HierarchyEntry::setData - caught IllegalArgumentException!" ); } + catch ( uno::RuntimeException const & ) + { + throw; + } catch ( container::NoSuchElementException const & ) { // replaceByName, getByName diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 7bef455c2a17..43146545402f 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -2596,16 +2596,16 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream ) xParentContainer->insertByName( m_aProps.aTitle, uno::makeAny( xNew ) ); } - catch ( uno::RuntimeException const & ) - { - throw; - } catch ( lang::IllegalArgumentException const & ) { // insertByName OSL_FAIL( "Content::storeData - insertByName failed!" ); return sal_False; } + catch ( uno::RuntimeException const & ) + { + throw; + } catch ( container::ElementExistException const & ) { // insertByName |