summaryrefslogtreecommitdiff
authorMichael Stahl <mstahl@redhat.com>2012-11-20 18:07:31 (GMT)
committer Michael Stahl <mstahl@redhat.com>2012-11-26 22:14:33 (GMT)
commit31170413ae3786bf44564e813d7291354e939a77 (patch) (side-by-side diff)
treeca37fdc23fa2d31217433ba9d7bc12fe66be94e9
parent1d095efaf989730c298b2ad99720eacf68f71229 (diff)
downloadcore-31170413ae3786bf44564e813d7291354e939a77.zip
core-31170413ae3786bf44564e813d7291354e939a77.tar.gz
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 (more/less context) (ignore whitespace changes)
-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 252564d..f9861d8 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1568,7 +1568,6 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
m_xInteractionHandler = xDestDocHandler;
}
catch( const RuntimeException& ) { throw; }
- catch( const IllegalArgumentException& ) { throw; }
catch( const SQLException& ) { throw; }
catch( const Exception& )
{
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 4d54abc..8f469ed 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -940,9 +940,6 @@ void PackageManagerImpl::removePackage(
catch (const RuntimeException &) {
throw;
}
- catch (const lang::IllegalArgumentException &) {
- throw;
- }
catch (const CommandFailedException & exc) {
logIntern( Any(exc) );
throw;
@@ -1089,14 +1086,14 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage(
const ::osl::MutexGuard guard( getMutex() );
return getDeployedPackage_( id, fileName, xCmdEnv );
}
- 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) );
throw;
}
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index a142d35..955a5ac 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -177,9 +177,6 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
catch (const RuntimeException &) {
throw;
}
- catch (const lang::IllegalArgumentException &) {
- throw;
- }
catch (const CommandFailedException &) {
throw;
}
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index ad5e0fd..8700d02 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -720,7 +720,6 @@ namespace frm
}
catch( const RuntimeException& ) { throw; }
catch( const SQLException& ) { throw; }
- catch( const IllegalArgumentException& ) { throw; }
catch( const Exception& )
{
throw WrappedTargetException( ::rtl::OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() );
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 304f7c4..a36c753 100644
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -179,7 +179,7 @@ public class PathSettingsTest
System.out.println("Can't convert Object to String");
}
}
- catch (com.sun.star.uno.Exception e)
+ catch (com.sun.star.lang.IllegalArgumentException e)
{
/* ignore */
}
@@ -273,7 +273,7 @@ public class PathSettingsTest
// System.out.print(" ==> ");
// System.out.print(sValue);
}
- catch (com.sun.star.uno.Exception e)
+ catch (com.sun.star.lang.IllegalArgumentException e)
{
// System.out.print(" FAILED ");
}
diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
index 9ff5633..daf129e 100644
--- a/jurt/test/com/sun/star/uno/AnyConverter_Test.java
+++ b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
@@ -573,10 +573,10 @@ public final class AnyConverter_Test {
assertEquals(
exc,
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();
} catch (com.sun.star.lang.IllegalArgumentException ie) {}
any_exc = new Any(com.sun.star.lang.IllegalArgumentException.class,
@@ -589,10 +589,10 @@ public final class AnyConverter_Test {
assertEquals(
exc,
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();
} catch (com.sun.star.lang.IllegalArgumentException ie) {}
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 4478c94..5991297 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 a42e680..bfd2302 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -4845,13 +4845,6 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam
m_pImpl->AddLog( OSL_LOG_PREFIX "Rethrow" );
throw;
}
- catch( const lang::IllegalArgumentException& aIAException )
- {
- m_pImpl->AddLog( aIAException.Message );
- m_pImpl->AddLog( OSL_LOG_PREFIX "Rethrow" );
-
- throw;
- }
catch( const uno::Exception& aException )
{
m_pImpl->AddLog( aException.Message );
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index 35b6ce4..2be265f 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;
diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java
index ffb4538..97fb2c5 100644
--- a/qadevOOo/runner/util/BasicMacroTools.java
+++ b/qadevOOo/runner/util/BasicMacroTools.java
@@ -169,7 +169,7 @@ public class BasicMacroTools {
e.printStackTrace();
throw new Exception("ERROR: Library " + LibraryName +
"already exist." + e.toString());
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace();
throw new Exception("Could not link Basic library:" +
LibraryName + e.toString());
diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
index 92c2ef8..c9846f6 100644
--- a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
+++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
@@ -130,7 +130,7 @@ public class ObjectInspectorModel extends TestCase {
tEnv.addObjRelation("maxHelpTextLines", new Integer(maxHelpTextLines));
return tEnv;
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace(log);
throw new StatusException("Unexpected exception", e);
}
diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
index a389976..f2d7222 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
@@ -152,8 +152,6 @@ public class various extends TestCase {
acceptedCall = acc.accept(connectString) ;
xBrdgFctr.createBridge("MyBridge", "urp",
acceptedCall, xInstProv);
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- ex = e ;
} catch (com.sun.star.connection.ConnectionSetupException e) {
ex = e ;
} catch (com.sun.star.connection.AlreadyAcceptingException e) {
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java
index c2c11c0..6801e64 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -147,8 +147,6 @@ public class various extends TestCase {
public void run() {
try {
acceptedCall = acc.accept(connectString) ;
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- ex = e ;
} catch (com.sun.star.connection.ConnectionSetupException e) {
ex = e ;
} catch (com.sun.star.connection.AlreadyAcceptingException e) {
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
index e43a0ec..fec8bd6 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
@@ -169,7 +169,7 @@ public class AccessibleBrowseBox extends TestCase {
public void fireEvent() {
try {
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 f65046d..1e8d117 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
@@ -104,7 +104,7 @@ public class SwXCellRange extends TestCase {
if( SOF.getTableCollection( xTextDoc ).getCount() == 0 ) {
try {
SOF.insertTextContent(xTextDoc, the_table );
- } catch( com.sun.star.uno.Exception e ) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace( log );
throw new StatusException("Couldn't create TextTable : "
+ e.getMessage(), e);
diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
index 046dc9e..3355710 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
@@ -112,7 +112,7 @@ public class SwXDocumentIndex extends TestCase {
log.println("inserting the Index into text document");
try {
oText.insertTextContent(oCursor, xTC, false);
- } catch (com.sun.star.uno.Exception e) {
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
e.printStackTrace(log);
throw new StatusException("Couldn't insert the Index", e);
}
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
index f97032b..83a8f30 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
@@ -104,7 +104,7 @@ public class SwXTextTable extends TestCase {
if (SOF.getTableCollection(xTextDoc).getCount() == 0) {
try {
SOF.insertTextContent(xTextDoc, oObj);
- } catch (com.sun.star.uno.Exception uE) {
+ } catch (com.sun.star.lang.IllegalArgumentException uE) {
uE.printStackTrace(log);
throw new StatusException("Couldn't create TextTable : " +
uE.getMessage(), uE);
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 f5fea74..c52497c 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -680,7 +680,7 @@ public abstract class ScriptProvider
XContent content = factory.createDocumentContent( document );
return content.getIdentifier().getContentIdentifier();
}
- 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 163929e..276b1b7 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3494,14 +3494,6 @@ uno::Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getSc
{
throw;
}
- catch( const lang::IllegalArgumentException& )
- {
- throw lang::WrappedTargetRuntimeException(
- ::rtl::OUString(),
- *this,
- ::cppu::getCaughtException()
- );
- }
return xScriptProvider;
}
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
index 2ed3ae5..7d2bec8 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
@@ -252,10 +252,6 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
{
throw r;
}
- catch ( com.sun.star.uno.Exception e )
- {
- throw new WrappedTargetException( sMethod, this, e );
- }
}
else if ( sMethod.equals( sAdd ) )
{
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 75665a9..7fbae5c 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 7bef455..4314654 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
diff --git a/udkapi/com/sun/star/lang/IllegalArgumentException.idl b/udkapi/com/sun/star/lang/IllegalArgumentException.idl
index 59e3abc..9e522b8 100644
--- a/udkapi/com/sun/star/lang/IllegalArgumentException.idl
+++ b/udkapi/com/sun/star/lang/IllegalArgumentException.idl
@@ -19,21 +19,16 @@
#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#define __com_sun_star_lang_IllegalArgumentException_idl__
-#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
passed an illegal or inappropriate argument.
*/
-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.
<p>This field is -1 if the position is not known.</p>
@@ -42,7 +37,6 @@ published exception IllegalArgumentException: com::sun::star::uno::Exception
};
-
}; }; }; };
#endif
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index 22eb3b1..e25a7060 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -1476,7 +1476,7 @@ public class NumericalHelper
}
catch (com.sun.star.lang.IllegalArgumentException e)
{
- DebugHelper.exception(e);
+//TODO does not do anything anyway DebugHelper.exception(e);
}
// reverse again to get the number
return romanNumber.reverse().toString();
diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
index ca3e220..a6e69da 100644
--- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
+++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
@@ -61,7 +61,7 @@ public class PlaceholderTextElement extends TextElement
XTextContent xTextContent = createPlaceHolder(xmsf, placeHolderText, hint);
xTextRange.getText().insertTextContent(xTextRange.getStart(), xTextContent, true);
}
- catch (Exception ex)
+ catch (com.sun.star.lang.IllegalArgumentException ex)
{
ex.printStackTrace();
}
diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.java b/wizards/com/sun/star/wizards/common/PropertySetHelper.java
index 3e3246b..787b8ee 100644
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.java
+++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.java
@@ -93,11 +93,6 @@ public class PropertySetHelper
DebugHelper.writeInfo(e.getMessage());
DebugHelper.exception(e);
}
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- DebugHelper.writeInfo(e.getMessage());
- DebugHelper.exception(e);
- }
catch (com.sun.star.lang.WrappedTargetException e)
{
DebugHelper.writeInfo(e.getMessage());
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java
index 02a5b79..58ab35c 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.java
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.java
@@ -152,7 +152,7 @@ public class SystemDialog
sStorePath = sPathList[0];
}
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
exception.printStackTrace();
}
@@ -199,7 +199,7 @@ public class SystemDialog
return xFilePicker.getFiles();
}
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
exception.printStackTrace();
}
diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java
index f2b351e..844c06b 100644
--- a/wizards/com/sun/star/wizards/query/Finalizer.java
+++ b/wizards/com/sun/star/wizards/query/Finalizer.java
@@ -146,7 +146,7 @@ public class Finalizer
m_queryWizard.setControlProperty("txtSummary", "Text", CurDBMetaData.getSummaryString());
return sCurQueryName;
}
- catch (com.sun.star.uno.Exception exception)
+ catch (IllegalArgumentException exception)
{
exception.printStackTrace(System.err);
return PropertyNames.EMPTY_STRING;
diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java
index 83358f2..7806475 100644
--- a/wizards/com/sun/star/wizards/report/DBColumn.java
+++ b/wizards/com/sun/star/wizards/report/DBColumn.java
@@ -341,7 +341,7 @@ public class DBColumn
}
}
}
- catch (Exception exception)
+ catch (IllegalArgumentException exception)
{
System.err.println(exception);
}
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 3a05e7c..5204ab1 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -184,7 +184,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
oViewHandler.selectFirstPage(oTextTableHandler);
// xProgressBar.end();
}
- catch (Exception e)
+ catch (IllegalArgumentException e)
{
Logger.getLogger(ReportTextDocument.class.getName()).log(Level.SEVERE, null, e);
}
@@ -274,7 +274,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
}
}
}
- catch (Exception e)
+ catch (IllegalArgumentException e)
{
Logger.getLogger(ReportTextDocument.class.getName()).log(Level.SEVERE, null, e);
}
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index e9a756f..4e706f3 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -756,7 +756,7 @@ public class FilterComponent
}
return false;
}
- catch (Exception exception)
+ catch (IllegalArgumentException exception)
{
exception.printStackTrace(System.err);
return false;
@@ -817,7 +817,7 @@ public class FilterComponent
Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", _filtercondition.Value);
}
}
- catch (Exception e)
+ catch (IllegalArgumentException e)
{
e.printStackTrace(System.err);
}
@@ -858,7 +858,7 @@ public class FilterComponent
{
iselected = (short[]) AnyConverter.toArray(Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOLSTOPERATOR]), PropertyNames.SELECTED_ITEMS));
}
- catch (Exception e)
+ catch (IllegalArgumentException e)
{
e.printStackTrace(System.err);
}
@@ -883,7 +883,7 @@ public class FilterComponent
short[] SelFields = (short[]) AnyConverter.toArray(Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOLSTFIELDNAME]), PropertyNames.SELECTED_ITEMS));
return FieldNames[SelFields[0]];
}
- catch (Exception exception)
+ catch (IllegalArgumentException exception)
{
exception.printStackTrace(System.err);
}
@@ -923,7 +923,7 @@ public class FilterComponent
return -1;
}
}
- catch (Exception exception)
+ catch (IllegalArgumentException exception)
{
exception.printStackTrace(System.err);
}
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 583751d..cdc7b8b 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -532,7 +532,7 @@ public class UnoDialog implements EventNames
int iCurStep = AnyConverter.toInt(getControlProperty(controlname, PropertyNames.PROPERTY_STEP));
setControlProperty(controlname, PropertyNames.PROPERTY_STEP, new Integer(iStep));
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
exception.printStackTrace(System.err);
}
@@ -563,7 +563,7 @@ public class UnoDialog implements EventNames
setControlProperty(controlname, PropertyNames.PROPERTY_STEP, UIConsts.INVISIBLESTEP);
}
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
exception.printStackTrace(System.err);
}
@@ -580,7 +580,7 @@ public class UnoDialog implements EventNames
Helper.setUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_STEP, 99);
Helper.setUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_STEP, new Integer(ncurstep));
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
exception.printStackTrace(System.err);
}
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 5904ec6..e7c3323 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -208,7 +208,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
{
return AnyConverter.toInt(Helper.getUnoPropertyValue(oRoadmap, "CurrentItemID"));
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
exception.printStackTrace(System.err);
return -1;
@@ -616,7 +616,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
bIsEnabled = AnyConverter.toBoolean(Helper.getUnoPropertyValue(xRoadmapItem, PropertyNames.PROPERTY_ENABLED));
return bIsEnabled;
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
exception.printStackTrace(System.err);
return false;
@@ -706,7 +706,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
{
return AnyConverter.toInt(Helper.getUnoPropertyValue(this.MSFDialogModel, PropertyNames.PROPERTY_STEP));
}
- catch (com.sun.star.uno.Exception exception)
+ catch (com.sun.star.lang.IllegalArgumentException exception)
{
exception.printStackTrace(System.err);
return -1;