summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-11-20 19:07:31 +0100
committerMichael Stahl <mstahl@redhat.com>2012-11-26 23:14:33 +0100
commit31170413ae3786bf44564e813d7291354e939a77 (patch)
treeca37fdc23fa2d31217433ba9d7bc12fe66be94e9
parent1d095efaf989730c298b2ad99720eacf68f71229 (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
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx1
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx11
-rw-r--r--desktop/source/deployment/registry/dp_backend.cxx3
-rw-r--r--forms/source/runtime/formoperations.cxx1
-rw-r--r--framework/qa/complex/path_settings/PathSettingsTest.java4
-rw-r--r--jurt/test/com/sun/star/uno/AnyConverter_Test.java8
-rw-r--r--offapi/type_reference/types.rdbbin7655424 -> 7655424 bytes
-rw-r--r--package/source/xstor/xstorage.cxx7
-rw-r--r--pyuno/source/module/pyuno_adapter.cxx14
-rw-r--r--qadevOOo/runner/util/BasicMacroTools.java2
-rw-r--r--qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java2
-rw-r--r--qadevOOo/tests/java/mod/_remotebridge/uno/various.java2
-rw-r--r--qadevOOo/tests/java/mod/_remotebridge/various.java2
-rw-r--r--qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java2
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXCellRange.java2
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java2
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXTextTable.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java2
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx8
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java4
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydata.cxx8
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx8
-rw-r--r--udkapi/com/sun/star/lang/IllegalArgumentException.idl14
-rw-r--r--wizards/com/sun/star/wizards/common/NumericalHelper.java2
-rw-r--r--wizards/com/sun/star/wizards/common/PlaceholderTextElement.java2
-rw-r--r--wizards/com/sun/star/wizards/common/PropertySetHelper.java5
-rw-r--r--wizards/com/sun/star/wizards/common/SystemDialog.java4
-rw-r--r--wizards/com/sun/star/wizards/query/Finalizer.java2
-rw-r--r--wizards/com/sun/star/wizards/report/DBColumn.java2
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextDocument.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java10
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java6
33 files changed, 55 insertions, 97 deletions
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 252564d610d8..f9861d8820ba 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1570,3 +1570,2 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
catch( const RuntimeException& ) { throw; }
- catch( const IllegalArgumentException& ) { throw; }
catch( const SQLException& ) { throw; }
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 4d54abcf6d40..8f469ed545c9 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -942,5 +942,2 @@ void PackageManagerImpl::removePackage(
}
- catch (const lang::IllegalArgumentException &) {
- throw;
- }
catch (const CommandFailedException & exc) {
@@ -1091,10 +1088,10 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage(
}
- catch (const RuntimeException &) {
+ catch (const lang::IllegalArgumentException & exc) {
+ logIntern( Any(exc) );
throw;
}
- catch (const CommandFailedException & exc) {
- logIntern( Any(exc) );
+ catch (const RuntimeException &) {
throw;
}
- catch (const lang::IllegalArgumentException & exc) {
+ catch (const CommandFailedException & exc) {
logIntern( Any(exc) );
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index a142d358793c..955a5acd8897 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -179,5 +179,2 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
}
- catch (const lang::IllegalArgumentException &) {
- throw;
- }
catch (const CommandFailedException &) {
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index ad5e0fd23e85..8700d02584b2 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -722,3 +722,2 @@ namespace frm
catch( const SQLException& ) { throw; }
- catch( const IllegalArgumentException& ) { throw; }
catch( const Exception& )
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 304f7c4531df..a36c75366744 100644
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -181,3 +181,3 @@ public class PathSettingsTest
}
- catch (com.sun.star.uno.Exception e)
+ catch (com.sun.star.lang.IllegalArgumentException e)
{
@@ -275,3 +275,3 @@ public class PathSettingsTest
}
- catch (com.sun.star.uno.Exception e)
+ catch (com.sun.star.lang.IllegalArgumentException e)
{
diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
index 9ff5633b7c31..daf129e07dd6 100644
--- a/jurt/test/com/sun/star/uno/AnyConverter_Test.java
+++ b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
@@ -575,6 +575,6 @@ public final class AnyConverter_Test {
AnyConverter.toObject(
- new Type(com.sun.star.uno.Exception.class), any_exc));
+ new Type(com.sun.star.uno.RuntimeException.class), any_exc));
try {
AnyConverter.toObject(
- new Type(com.sun.star.uno.RuntimeException.class), any_exc);
+ new Type(com.sun.star.uno.Exception.class), any_exc);
fail();
@@ -591,6 +591,6 @@ public final class AnyConverter_Test {
AnyConverter.toObject(
- new Type(com.sun.star.uno.Exception.class), any_exc));
+ new Type(com.sun.star.uno.RuntimeException.class), any_exc));
try {
AnyConverter.toObject(
- new Type(com.sun.star.uno.RuntimeException.class), any_exc);
+ new Type(com.sun.star.uno.Exception.class), any_exc);
fail();
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 4478c945a67b..59912974bf58 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
Binary files differ
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index a42e68074242..bfd2302a47b7 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -4847,9 +4847,2 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam
}
- catch( const lang::IllegalArgumentException& aIAException )
- {
- m_pImpl->AddLog( aIAException.Message );
- m_pImpl->AddLog( OSL_LOG_PREFIX "Rethrow" );
-
- throw;
- }
catch( const uno::Exception& aException )
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
@@ -325,8 +325,8 @@ Any Adapter::invoke( const OUString &aFunctionName,
}
- 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) );
@@ -335,5 +335,5 @@ Any Adapter::invoke( const OUString &aFunctionName,
}
- catch( const CannotConvertException & e )
+ catch( const RuntimeException & e )
{
- if( isLog( cargo, LogLevel::CALL ) )
+ if( cargo && isLog( cargo, LogLevel::CALL ) )
{
@@ -345,3 +345,3 @@ Any Adapter::invoke( const OUString &aFunctionName,
}
- catch( const IllegalArgumentException & e )
+ catch( const CannotConvertException & e )
{
@@ -350,3 +350,3 @@ Any Adapter::invoke( const OUString &aFunctionName,
logException(
- cargo, "except uno->py[0x" ,
+ cargo, "except uno->py[0x" ,
mWrappedObject.get(), aFunctionName, &e,getCppuType(&e) );
diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java
index ffb4538254d6..97fb2c53fab2 100644
--- a/qadevOOo/runner/util/BasicMacroTools.java
+++ b/qadevOOo/runner/util/BasicMacroTools.java
@@ -171,3 +171,3 @@ public class BasicMacroTools {
"already exist." + e.toString());
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace();
diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
index 92c2ef81e579..c9846f6f4cae 100644
--- a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
+++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
@@ -132,3 +132,3 @@ public class ObjectInspectorModel extends TestCase {
return tEnv;
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace(log);
diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
index a38997618329..f2d722213daa 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
@@ -154,4 +154,2 @@ public class various extends TestCase {
acceptedCall, xInstProv);
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- ex = e ;
} catch (com.sun.star.connection.ConnectionSetupException e) {
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java
index c2c11c076320..6801e642d9fb 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -149,4 +149,2 @@ public class various extends TestCase {
acceptedCall = acc.accept(connectString) ;
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- ex = e ;
} catch (com.sun.star.connection.ConnectionSetupException e) {
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
index e43a0ecb2b3b..fec8bd66031b 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
@@ -171,3 +171,3 @@ public class AccessibleBrowseBox extends TestCase {
xSelect.select(fParams);
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace();
diff --git a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
index f65046d4d718..1e8d11795fb5 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
@@ -106,3 +106,3 @@ public class SwXCellRange extends TestCase {
SOF.insertTextContent(xTextDoc, the_table );
- } catch( com.sun.star.uno.Exception e ) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
index 046dc9e29992..335571066319 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
@@ -114,3 +114,3 @@ public class SwXDocumentIndex extends TestCase {
oText.insertTextContent(oCursor, xTC, false);
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace(log);
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
index f97032b4daa7..83a8f30b1bc0 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
@@ -106,3 +106,3 @@ public class SwXTextTable extends TestCase {
SOF.insertTextContent(xTextDoc, oObj);
- } catch (com.sun.star.uno.Exception uE) {
+ } catch (com.sun.star.lang.IllegalArgumentException uE) {
uE.printStackTrace(log);
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index f5fea74717c1..c52497c66126 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -682,3 +682,3 @@ public abstract class ScriptProvider
}
- catch( Exception ex )
+ catch (com.sun.star.lang.IllegalArgumentException ex)
{
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 163929e826d4..276b1b7bbb09 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3496,10 +3496,2 @@ uno::Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getSc
}
- catch( const lang::IllegalArgumentException& )
- {
- throw lang::WrappedTargetRuntimeException(
- ::rtl::OUString(),
- *this,
- ::cppu::getCaughtException()
- );
- }
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
index 2ed3ae52b579..7d2bec8910e7 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
@@ -254,6 +254,2 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
}
- catch ( com.sun.star.uno.Exception e )
- {
- throw new WrappedTargetException( sMethod, this, e );
- }
}
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
@@ -450,6 +450,2 @@ sal_Bool HierarchyEntry::setData(
}
- catch ( uno::RuntimeException const & )
- {
- throw;
- }
catch ( lang::IllegalArgumentException const & )
@@ -461,2 +457,6 @@ sal_Bool HierarchyEntry::setData(
}
+ catch ( uno::RuntimeException const & )
+ {
+ throw;
+ }
catch ( container::NoSuchElementException const & )
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
@@ -2598,6 +2598,2 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
}
- catch ( uno::RuntimeException const & )
- {
- throw;
- }
catch ( lang::IllegalArgumentException const & )
@@ -2608,2 +2604,6 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
}
+ catch ( uno::RuntimeException const & )
+ {
+ throw;
+ }
catch ( container::ElementExistException const & )
diff --git a/udkapi/com/sun/star/lang/IllegalArgumentException.idl b/udkapi/com/sun/star/lang/IllegalArgumentException.idl
index 59e3abc30c9b..9e522b8e38a9 100644
--- a/udkapi/com/sun/star/lang/IllegalArgumentException.idl
+++ b/udkapi/com/sun/star/lang/IllegalArgumentException.idl
@@ -21,10 +21,6 @@
-#include <com/sun/star/uno/Exception.idl>
+#include <com/sun/star/uno/RuntimeException.idl>
+module com { module sun { module star { module lang {
-
- module com { module sun { module star { module lang {
-
-
-// DocMerge from xml: exception com::sun::star::lang::IllegalArgumentException
/** This exception is thrown to indicate that a method has
@@ -32,6 +28,5 @@
*/
-published exception IllegalArgumentException: com::sun::star::uno::Exception
+published exception IllegalArgumentException
+ : com::sun::star::uno::RuntimeException
{
-
- // DocMerge from xml: field com::sun::star::lang::IllegalArgumentException::ArgumentPosition
/** identifies the position of the illegal argument.
@@ -44,3 +39,2 @@ published exception IllegalArgumentException: com::sun::star::uno::Exception
-
}; }; }; };
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index 22eb3b1c7a03..e25a706056b0 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -1478,3 +1478,3 @@ public class NumericalHelper
{
- DebugHelper.exception(e);
+//TODO does not do anything anyway DebugHelper.exception(e);
}
diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
index ca3e22015ae0..a6e69da9ef60 100644
--- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
+++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
@@ -63,3 +63,3 @@ public class PlaceholderTextElement extends TextElement
}
- catch (Exception ex)
+ catch (com.sun.star.lang.IllegalArgumentException ex)
{
diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.java b/wizards/com/sun/star/wizards/common/PropertySetHelper.java
index 3e3246b5797a..787b8eeef6d0 100644
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.java
+++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.java
@@ -95,7 +95,2 @@ public class PropertySetHelper
}
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- DebugHelper.writeInfo(e.getMessage());
- DebugHelper.exception(e);
- }
catch (com.sun.star.lang.WrappedTargetException e)
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java
index 02a5b7962832..58ab35ce7092 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.java
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.java
@@ -154,3 +154,3 @@ public class SystemDialog
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
@@ -201,3 +201,3 @@ public class SystemDialog
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java
index f2b351e57cbe..844c06bb8c37 100644
--- a/wizards/com/sun/star/wizards/query/Finalizer.java
+++ b/wizards/com/sun/star/wizards/query/Finalizer.java
@@ -148,3 +148,3 @@ public class Finalizer
}
- catch (com.sun.star.uno.Exception exception)
+ catch (IllegalArgumentException exception)
{
diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java
index 83358f2faef8..78064756c425 100644
--- a/wizards/com/sun/star/wizards/report/DBColumn.java
+++ b/wizards/com/sun/star/wizards/report/DBColumn.java
@@ -343,3 +343,3 @@ public class DBColumn
}
- catch (Exception exception)
+ catch (IllegalArgumentException exception)
{
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 3a05e7ca0847..5204ab1d8178 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -186,3 +186,3 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
}
- catch (Exception e)
+ catch (IllegalArgumentException e)
{
@@ -276,3 +276,3 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
}
- catch (Exception e)
+ catch (IllegalArgumentException e)
{
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index e9a756ffefd2..4e706f3623c3 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -758,3 +758,3 @@ public class FilterComponent
}
- catch (Exception exception)
+ catch (IllegalArgumentException exception)
{
@@ -819,3 +819,3 @@ public class FilterComponent
}
- catch (Exception e)
+ catch (IllegalArgumentException e)
{
@@ -860,3 +860,3 @@ public class FilterComponent
}
- catch (Exception e)
+ catch (IllegalArgumentException e)
{
@@ -885,3 +885,3 @@ public class FilterComponent
}
- catch (Exception exception)
+ catch (IllegalArgumentException exception)
{
@@ -925,3 +925,3 @@ public class FilterComponent
}
- catch (Exception exception)
+ catch (IllegalArgumentException exception)
{
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 583751de9874..cdc7b8bfe58c 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -534,3 +534,3 @@ public class UnoDialog implements EventNames
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
@@ -565,3 +565,3 @@ public class UnoDialog implements EventNames
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
@@ -582,3 +582,3 @@ public class UnoDialog implements EventNames
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 5904ec6ccc9b..e7c3323befff 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -210,3 +210,3 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
@@ -618,3 +618,3 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
@@ -708,3 +708,3 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{