diff options
5 files changed, 42 insertions, 41 deletions
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 4a82c5ec6310..384ad6027d60 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -894,28 +894,30 @@ public class OOoBean NoDocumentException, java.io.IOException, com.sun.star.lang.IllegalArgumentException - { + { // wrap byte arrray into UNO stream - com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter aStream = - new com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter( - aOutBuffer ); + com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter aStream = new com.sun.star.lib.uno.adapter.XOutputStreamToByteArrayAdapter( + aOutBuffer); // add stream to arguments - com.sun.star.beans.PropertyValue[] aExtendedArguments = - addArgument( aArguments, new com.sun.star.beans.PropertyValue( - "OutputStream", -1, aStream, com.sun.star.beans.PropertyState.DIRECT_VALUE ) ); + com.sun.star.beans.PropertyValue[] aExtendedArguments = addArgument( + aArguments, new com.sun.star.beans.PropertyValue( + "OutputStream", -1, aStream, + com.sun.star.beans.PropertyState.DIRECT_VALUE)); // call normal store method - storeToURL( "private:stream", aExtendedArguments ); + storeToURL("private:stream", aExtendedArguments); // get byte array from document stream - try { aStream.closeOutput(); } - catch ( com.sun.star.io.NotConnectedException aExc ) - { /* TDB */ } - catch ( com.sun.star.io.BufferSizeExceededException aExc ) - { /* TDB */ } - catch ( com.sun.star.io.IOException aExc ) - { throw new java.io.IOException(); } + try { + aStream.closeOutput(); + } catch (com.sun.star.io.NotConnectedException aExc) { /* TDB */ + } catch (com.sun.star.io.BufferSizeExceededException aExc) { /* TDB */ + } catch (com.sun.star.io.IOException ex1) { + java.io.IOException ex2 = new java.io.IOException(); + ex2.initCause(ex1); + throw ex2; + } return aStream.getBuffer(); } diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java index 0a2a856f774f..ead35dd78b40 100644 --- a/qadevOOo/runner/util/BasicMacroTools.java +++ b/qadevOOo/runner/util/BasicMacroTools.java @@ -109,14 +109,9 @@ public class BasicMacroTools { private static XURLTransformer makeParser(XMultiServiceFactory mMSF) throws java.lang.Exception { - try { - return UnoRuntime.queryInterface( - XURLTransformer.class, mMSF.createInstance( - "com.sun.star.util.URLTransformer")); - } catch (Exception e) { - throw new Exception("could not create UTL-Transformer " + - e.toString()); - } + return UnoRuntime.queryInterface( + XURLTransformer.class, mMSF.createInstance( + "com.sun.star.util.URLTransformer")); } public void loadLibrary(String LibraryName, String LibraryURL) diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java b/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java index 6bc506ea2b8d..9f93e00209d7 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java @@ -56,8 +56,7 @@ public class _XPropertyWithState extends MultiMethodTest { oObj.getDefaultAsProperty(); } catch (com.sun.star.lang.WrappedTargetException e){ - e.printStackTrace(log); - throw new StatusException(Status.failed("'com.sun.star.lang.WrappedTargetException' was thrown")); + throw new StatusException(e, Status.failed("'com.sun.star.lang.WrappedTargetException' was thrown")); } tRes.tested("getDefaultAsProperty()", true); diff --git a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java index 17839ab97c3b..aaa4303b2a90 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java @@ -164,8 +164,7 @@ public class TableWindowAccessibility extends TestCase { store.storeAsURL(aFile,new PropertyValue[]{}); log.println("... done"); } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(log); - throw new StatusException(Status.failed("Couldn't register object")); + throw new StatusException(e, Status.failed("Couldn't register object")); } isolConnection = UnoRuntime.queryInterface( diff --git a/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java b/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java index a7b580272c9f..08d06dce3b1d 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java @@ -57,14 +57,16 @@ public class StrictResolver implements Resolver { try { m = resolveArguments(sd, c); - } catch (ClassNotFoundException e) { - throw new NoSuchMethodException( - "StrictResolver.getProxy: Can't find method: " + sd.getMethodName() - + ":" + e.getMessage()); - } catch (NoSuchMethodException e) { - throw new NoSuchMethodException( - "StrictResolver.getProxy: Can't find method: " + sd.getMethodName() - + ":" + e.getMessage()); + } catch (ClassNotFoundException ex1) { + NoSuchMethodException ex2 = new NoSuchMethodException( + "StrictResolver.getProxy: Can't find method: " + sd.getMethodName()); + ex2.initCause(ex1); + throw ex2; + } catch (NoSuchMethodException ex1) { + NoSuchMethodException ex2 = new NoSuchMethodException( + "StrictResolver.getProxy: Can't find method: " + sd.getMethodName()); + ex2.initCause(ex1); + throw ex2; } ScriptProxy sp = new ScriptProxy(m); @@ -76,12 +78,16 @@ public class StrictResolver implements Resolver { try { o = c.newInstance(); - } catch (InstantiationException ie) { - throw new NoSuchMethodException( - "getScriptProxy: Can't instantiate: " + c.getName()); - } catch (IllegalAccessException iae) { - throw new NoSuchMethodException( - "getScriptProxy: Can't access: " + c.getName()); + } catch (InstantiationException ex1) { + NoSuchMethodException ex2 = new NoSuchMethodException( + "getScriptProxy: Can't instantiate: " + c.getName()); + ex2.initCause(ex1); + throw ex2; + } catch (IllegalAccessException ex1) { + NoSuchMethodException ex2 = new NoSuchMethodException( + "getScriptProxy: Can't access: " + c.getName()); + ex2.initCause(ex1); + throw ex2; } sp.setTargetObject(o); |