java:remove more unnecessary catch/re-throw

Change-Id: Id9a13c7f4ae0fd53c95c551544e60af44bb3fb95
Reviewed-on: https://gerrit.libreoffice.org/16203
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

10 files changed, 30 insertions, 103 deletions

diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java
index 8f82607eac99..eae3f905ec16 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java
@@ -20,7 +20,6 @@ package mod._xmloff.Impress;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -69,19 +68,13 @@ public class XMLContentExporter extends TestCase {
      * New text document created.
      */
     @Override
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
+    protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
 
         // get a soffice factory object
         SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
 
-        try {
-            log.println( "creating an impress document" );
-            xImpressDoc = SOF.createImpressDoc(null);
-        } catch ( Exception e ) {
-            // Some exception occurs.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
-        }
+        log.println( "creating an impress document" );
+        xImpressDoc = SOF.createImpressDoc(null);
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java
index 294f26dd4ef6..23ed91b475dd 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java
@@ -20,7 +20,6 @@ package mod._xmloff.Impress;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -66,19 +65,13 @@ public class XMLContentImporter extends TestCase {
     * New chart document created.
     */
     @Override
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
+    protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
 
         // get a soffice factory object
         SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
 
-        try {
-            log.println( "creating an impress document" );
-            xImpressDoc = SOF.createImpressDoc(null);
-        } catch ( Exception e ) {
-            // Some exception occurs.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
-        }
+        log.println( "creating an impress document" );
+        xImpressDoc = SOF.createImpressDoc(null);
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java
index 4f5c4c3536df..03080f9d3ac0 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java
@@ -20,7 +20,6 @@ package mod._xmloff.Impress;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -70,19 +69,13 @@ public class XMLExporter extends TestCase {
      * New impress document created.
      */
     @Override
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
+    protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
 
         // get a soffice factory object
         SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
 
-        try {
-            log.println( "creating an impress document" );
-            xImpressDoc = SOF.createImpressDoc(null);
-        } catch ( Exception e ) {
-            // Some exception occurs.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
-        }
+        log.println( "creating an impress document" );
+        xImpressDoc = SOF.createImpressDoc(null);
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java
index 1db475354957..1331d9130be0 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java
@@ -20,7 +20,6 @@ package mod._xmloff.Impress;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -66,19 +65,13 @@ public class XMLImporter extends TestCase {
      * New impress document created.
      */
     @Override
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
+    protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
 
         // get a soffice factory object
         SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
 
-        try {
-            log.println( "creating an impress document" );
-            xImpressDoc = SOF.createImpressDoc(null);
-        } catch ( Exception e ) {
-            // Some exception occurs.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
-        }
+        log.println( "creating an impress document" );
+        xImpressDoc = SOF.createImpressDoc(null);
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
index 6abece931bdb..a63767f6a99a 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java
@@ -20,7 +20,6 @@ package mod._xmloff.Impress;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -68,19 +67,13 @@ public class XMLMetaExporter extends TestCase {
     * New impress document created.
     */
     @Override
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
+    protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
 
         // get a soffice factory object
         SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
 
-        try {
-            log.println( "creating an impress document" );
-            xImpressDoc = SOF.createImpressDoc(null);
-        } catch ( Exception e ) {
-        // Some exception occurs.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
-        }
+        log.println( "creating an impress document" );
+        xImpressDoc = SOF.createImpressDoc(null);
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java
index 2492871c8255..c50782e7ed4f 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java
@@ -20,7 +20,6 @@ package mod._xmloff.Impress;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -65,19 +64,13 @@ public class XMLMetaImporter extends TestCase {
     * New impress document created.
     */
     @Override
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
+    protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
 
         // get a soffice factory object
         SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
 
-        try {
-            log.println( "creating an impress document" );
-            xImpressDoc = SOF.createImpressDoc(null);
-        } catch ( Exception e ) {
-            // Some exception occurs.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
-        }
+        log.println( "creating an impress document" );
+        xImpressDoc = SOF.createImpressDoc(null);
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
index 3340f1056605..60177f670b53 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java
@@ -20,7 +20,6 @@ package mod._xmloff.Impress;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -69,17 +68,11 @@ public class XMLSettingsExporter extends TestCase {
     * New text document created.
     */
     @Override
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
+    protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
         SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
 
-        try {
-            log.println( "creating an impress document" );
-            xImpressDoc = SOF.createImpressDoc(null);
-        } catch ( Exception e ) {
-            // Some exception occurs.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
-        }
+        log.println( "creating an impress document" );
+        xImpressDoc = SOF.createImpressDoc(null);
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
index eb728044a51f..32860a675d4e 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java
@@ -67,19 +67,12 @@ public class XMLSettingsImporter extends TestCase {
     * New impress document created.
     */
     @Override
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
-
+    protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
         // get a soffice factory object
         SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
 
-        try {
-            log.println( "creating an impress document" );
-            xImpressDoc = SOF.createImpressDoc(null);
-        } catch ( Exception e ) {
-            // Some exception occurs.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
-        }
+        log.println( "creating an impress document" );
+        xImpressDoc = SOF.createImpressDoc(null);
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
index 4e5effcbf587..588909433618 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java
@@ -20,7 +20,6 @@ package mod._xmloff.Impress;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -71,19 +70,12 @@ public class XMLStylesExporter extends TestCase {
     * New spreadsheet document created.
     */
     @Override
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
-
+    protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
         // get a soffice factory object
         SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
 
-        try {
-            log.println( "creating an impress document" );
-            xImpressDoc = SOF.createImpressDoc(null);
-        } catch ( Exception e ) {
-            // Some exception occurs.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
-        }
+        log.println( "creating an impress document" );
+        xImpressDoc = SOF.createImpressDoc(null);
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java
index c78084c6a373..4b0823b44674 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java
@@ -20,7 +20,6 @@ package mod._xmloff.Impress;
 
 import java.io.PrintWriter;
 
-import lib.StatusException;
 import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
@@ -66,19 +65,11 @@ public class XMLStylesImporter extends TestCase {
     * New spreadsheet document created.
     */
     @Override
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
-
+    protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
         // get a soffice factory object
         SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF());
-
-        try {
-            log.println( "creating an impress document" );
-            xImpressDoc = SOF.createImpressDoc(null);
-        } catch ( Exception e ) {
-            // Some exception occurs.FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't create document", e );
-        }
+        log.println( "creating an impress document" );
+        xImpressDoc = SOF.createImpressDoc(null);
     }
 
     /**