Automated merge with http://hg-lan.germany.sun.com/ooo/DEV300

qadevOOo/runner/stats/Summarizer.java

@@ -78,7 +78,7 @@ public class Summarizer
             {
                 if (states.elementAt(j).equals("not part of the job"))
                 {
-                    state = "Not possible since not all Interfaces/Services have been checked";
+                    state = "PASSED(some interfaces/services not tested).OK";
                 }
                 else
                 {

qadevOOo/tests/java/mod/_forms/GenericModelTest.java

@@ -27,6 +27,7 @@
 package mod._forms;
 import com.sun.star.beans.NamedValue;
 import com.sun.star.beans.PropertyValue;
+import com.sun.star.container.XIndexAccess;
 import java.io.PrintWriter;
 
 import lib.StatusException;
@@ -251,11 +252,10 @@ public class GenericModelTest extends TestCase {
         if (m_ConnectionColsed) return;
 
         try {
+            XIndexAccess forms = UnoRuntime.queryInterface( XIndexAccess.class,
+                FormTools.getForms( WriterTools.getDrawPage( m_xTextDoc ) ) );
             XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class),
-                                                 (FormTools.getForms(
-                                                         WriterTools.getDrawPage(
-                                                                 m_xTextDoc)))
-                                                     .getByName("Standard"));
+                                                 forms.getByIndex(0));
 
             if (debug){
                 if (myForm == null){
@@ -269,18 +269,20 @@ public class GenericModelTest extends TestCase {
 
             }
 
-            XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface(
-                                            XPropertySet.class, myForm);
-            XConnection connection = (XConnection) AnyConverter.toObject(
-                                 new Type(XConnection.class),
-                                 xSetProp.getPropertyValue("ActiveConnection"));
-            if (debug && connection == null){
+            XPropertySet xSetProp = UnoRuntime.queryInterface( XPropertySet.class, myForm );
+            XConnection connection = UnoRuntime.queryInterface( XConnection.class, xSetProp.getPropertyValue( "ActiveConnection" ) );
+            if ( connection == null )
+            {
+                if ( debug )
                     log.println("ERROR: could not get property 'ActiveConnection' from the XForm");
             }
-
+            else
+            {
                 connection.close();
+            }
         } catch (Exception e) {
             log.println("ERROR: Can't close the connection: " + e.toString());
+            e.printStackTrace( log );
         }
 
         log.println("closing data source...");

testautomation/graphics/required/includes/impress/im_003_.inc

@@ -217,15 +217,15 @@ testcase tiViewToolbar_1
 
     printlog "open application "
     Call hNewDocument
+
+    printlog "use the empty layout"
     Call sSelectEmptyLayout
+
     printlog "delete default content"
     hUseAsyncSlot( "EditSelectAll" )
     Kontext "DocumentImpress"
     DocumentImpress.typeKeys("<DELETE>",true)
 
-    printlog "use the empty layout"
-    call sSelectEmptyLayout
-
     printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp "
     hUseAsyncSlot( "InsertGraphicsFromFile" )