From c1032dd013fe5cec7262f8b1727d793ae37ef7ec Mon Sep 17 00:00:00 2001 From: Thomas Benisch Date: Fri, 4 Jun 2010 20:08:33 +0200 Subject: [PATCH 1/2] calc55: #i112084# All charts in a Calc document are loaded when saving the document --- .../com/sun/star/lib/uno/helper/PropertySet.java | 11 +++++++---- 1 file changed, 7 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 25aba48c777a..ad2c8c7bcf88 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 WrappedTargetException("PropertySet.setPropertyValue_NoBroadcast", this, e); + throw new java.lang.RuntimeException(e); + } + catch(java.lang.IllegalAccessException e) + { + throw new java.lang.RuntimeException(e); } return ret; } @@ -1001,7 +1004,7 @@ XMultiPropertySet { value= getPropertyValue(prop); } - catch(WrappedTargetException e) + catch(Exception e) { continue; } From f7f37f47db4d76b5dc5cb3a00dca51b7da082500 Mon Sep 17 00:00:00 2001 From: "Eike Rathke [er]" Date: Mon, 7 Jun 2010 16:27:28 +0200 Subject: [PATCH 2/2] calc55: #i40309# #i31656# #i103458# improved accuracy of Bessel functions; patch from --- .../sun/star/sheet/NoConvergenceException.idl | 52 +++++++++++++++++++ offapi/com/sun/star/sheet/makefile.mk | 1 + 2 files changed, 53 insertions(+) create mode 100644 offapi/com/sun/star/sheet/NoConvergenceException.idl diff --git a/offapi/com/sun/star/sheet/NoConvergenceException.idl b/offapi/com/sun/star/sheet/NoConvergenceException.idl new file mode 100644 index 000000000000..b427b67f28ea --- /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 + * + * 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 +#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 dc1935ba2299..016378178f29 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\