diff options
| -rw-r--r-- | javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 11 | ||||
| -rw-r--r-- | offapi/com/sun/star/sheet/NoConvergenceException.idl | 52 | ||||
| -rw-r--r-- | offapi/com/sun/star/sheet/makefile.mk | 1 |
3 files changed, 60 insertions, 4 deletions
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java index f096d6dfd..0f18ac781 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java @@ -836,7 +836,6 @@ XMultiPropertySet * @return The value of the property. */ protected Object getPropertyValue(Property property) - throws com.sun.star.lang.WrappedTargetException { Object ret= null; try @@ -853,9 +852,13 @@ XMultiPropertySet ret= propField.get(this); } } - catch(java.lang.Exception e) + catch(java.lang.NoSuchFieldException e) + { + throw new java.lang.RuntimeException(e); + } + catch(java.lang.IllegalAccessException e) { - throw new WrappedTargetException("PropertySet.setPropertyValue_NoBroadcast", this, e); + throw new java.lang.RuntimeException(e); } return ret; } @@ -1001,7 +1004,7 @@ XMultiPropertySet { value= getPropertyValue(prop); } - catch(WrappedTargetException e) + catch(Exception e) { continue; } diff --git a/offapi/com/sun/star/sheet/NoConvergenceException.idl b/offapi/com/sun/star/sheet/NoConvergenceException.idl new file mode 100644 index 000000000..f846ec9aa --- /dev/null +++ b/offapi/com/sun/star/sheet/NoConvergenceException.idl @@ -0,0 +1,52 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_sheet_NoConvergenceException_idl__ +#define __com_sun_star_sheet_NoConvergenceException_idl__ + +#ifndef __com_sun_star_uno_Exception_idl__ +#include <com/sun/star/uno/Exception.idl> +#endif + +//============================================================================= + +module com { module sun { module star { module sheet { + +//============================================================================= + +/** Thrown by a Calc Add-In function this exception indicates the + function's algorithm did not converge to a meaningful result. + + @since OOo 3.3 + */ +exception NoConvergenceException : ::com::sun::star::uno::Exception{}; + +//============================================================================= +}; }; }; }; +//============================================================================= + +#endif diff --git a/offapi/com/sun/star/sheet/makefile.mk b/offapi/com/sun/star/sheet/makefile.mk index dc1935ba2..016378178 100644 --- a/offapi/com/sun/star/sheet/makefile.mk +++ b/offapi/com/sun/star/sheet/makefile.mk @@ -164,6 +164,7 @@ IDLFILES=\ NamedRangeFlag.idl\ NamedRanges.idl\ NamedRangesEnumeration.idl\ + NoConvergenceException.idl\ PasteOperation.idl\ RangeSelectionArguments.idl\ RangeSelectionEvent.idl\ |