1 files changed, 19 insertions, 37 deletions

diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
index bdf81b003683..dcb062727379 100644
--- a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
+++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java
@@ -17,11 +17,9 @@
  */
 
 package mod._pcr;
-import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XFrame;
 import com.sun.star.inspection.XObjectInspectorModel;
-import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 import com.sun.star.util.CloseVetoException;
@@ -87,7 +85,7 @@ public class ObjectInspectorModel extends TestCase {
      * @see helper.PropertyHandlerImpl
      */
     @Override
-    protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) {
+    protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) throws Exception {
 
         this.cleanup(tParam, log);
 
@@ -95,48 +93,32 @@ public class ObjectInspectorModel extends TestCase {
 
         XPropertySet xMSFProp = UnoRuntime.queryInterface(XPropertySet.class, xMSF);
         XComponentContext xDefaultContext = null;
-        try{
-            // Get the default context from the office server.
-            Object oDefaultContext = xMSFProp.getPropertyValue("DefaultContext");
-
-            // Query for the interface XComponentContext.
-            xDefaultContext = UnoRuntime.queryInterface(
-                    XComponentContext.class, oDefaultContext);
-
-        } catch (UnknownPropertyException e){
-            throw new StatusException("could not get DefaultContext from xMSF", e);
-        } catch (WrappedTargetException e){
-            throw new StatusException("could not get DefaultContext from xMSF", e);
-        } catch (Exception e){
-            throw new StatusException("could not get DefaultContext from xMSF", e);
-        }
-
-        try {
+        // Get the default context from the office server.
+        Object oDefaultContext = xMSFProp.getPropertyValue("DefaultContext");
 
-            Object[] oHandlerFactories = new Object[1];
-            oHandlerFactories[0] = new PropertyHandlerFactroy();
+        // Query for the interface XComponentContext.
+        xDefaultContext = UnoRuntime.queryInterface(
+                XComponentContext.class, oDefaultContext);
 
-            int minHelpTextLines = 200;
-            int maxHelpTextLines = 400;
+        Object[] oHandlerFactories = new Object[1];
+        oHandlerFactories[0] = new PropertyHandlerFactroy();
 
-            XObjectInspectorModel oInspectorModel = com.sun.star.inspection.ObjectInspectorModel.
-                    createWithHandlerFactoriesAndHelpSection(xDefaultContext, oHandlerFactories,
-                                                             minHelpTextLines, maxHelpTextLines);
+        int minHelpTextLines = 200;
+        int maxHelpTextLines = 400;
 
-            log.println("ImplementationName '" + utils.getImplName(oInspectorModel) + "'");
+        XObjectInspectorModel oInspectorModel = com.sun.star.inspection.ObjectInspectorModel.
+                createWithHandlerFactoriesAndHelpSection(xDefaultContext, oHandlerFactories,
+                                                         minHelpTextLines, maxHelpTextLines);
 
-            TestEnvironment tEnv = new TestEnvironment(oInspectorModel);
+        log.println("ImplementationName '" + utils.getImplName(oInspectorModel) + "'");
 
-            // com.sun.star.inspection.XObjectInspectorModel
-            tEnv.addObjRelation("minHelpTextLines", Integer.valueOf(minHelpTextLines));
-            tEnv.addObjRelation("maxHelpTextLines", Integer.valueOf(maxHelpTextLines));
+        TestEnvironment tEnv = new TestEnvironment(oInspectorModel);
 
-            return tEnv;
-        } catch (com.sun.star.lang.IllegalArgumentException e) {
-            e.printStackTrace(log);
-            throw new StatusException("Unexpected exception", e);
-        }
+        // com.sun.star.inspection.XObjectInspectorModel
+        tEnv.addObjRelation("minHelpTextLines", Integer.valueOf(minHelpTextLines));
+        tEnv.addObjRelation("maxHelpTextLines", Integer.valueOf(maxHelpTextLines));
 
+        return tEnv;
     }
 
     /**