diff options
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 @@ -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 4d54abcf6d40..8f469ed545c9 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 a142d358793c..955a5acd8897 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 ad5e0fd23e85..8700d02584b2 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 304f7c4531df..a36c75366744 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 9ff5633b7c31..daf129e07dd6 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 Binary files differindex 4478c945a67b..59912974bf58 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb 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 @@ -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 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; 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 @@ -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 92c2ef81e579..c9846f6f4cae 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 a38997618329..f2d722213daa 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 c2c11c076320..6801e642d9fb 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 e43a0ecb2b3b..fec8bd66031b 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 f65046d4d718..1e8d11795fb5 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 046dc9e29992..335571066319 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 f97032b4daa7..83a8f30b1bc0 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 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 @@ -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 163929e826d4..276b1b7bbb09 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 2ed3ae52b579..7d2bec8910e7 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 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 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 @@ -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 22eb3b1c7a03..e25a706056b0 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 ca3e22015ae0..a6e69da9ef60 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 3e3246b5797a..787b8eeef6d0 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 02a5b7962832..58ab35ce7092 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 f2b351e57cbe..844c06bb8c37 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 83358f2faef8..78064756c425 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 3a05e7ca0847..5204ab1d8178 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 e9a756ffefd2..4e706f3623c3 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 583751de9874..cdc7b8bfe58c 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 5904ec6ccc9b..e7c3323befff 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; |