INTEGRATION: CWS dellauncher (1.1.20); FILE MERGED

2008/07/18 07:50:26 jsk 1.1.20.1: #i91789

5 files changed, 20 insertions, 50 deletions

diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc
index cc58ceecad35..654ec45c38a5 100755
--- a/testautomation/dbaccess/required/includes/MainApp.inc
+++ b/testautomation/dbaccess/required/includes/MainApp.inc
@@ -8,9 +8,9 @@
 '*
 '* $RCSfile: MainApp.inc,v $
 '*
-'* $Revision: 1.1 $
+'* $Revision: 1.2 $
 '*
-'* last change: $Author: jsi $ $Date: 2008-06-16 07:43:45 $
+'* last change: $Author: obo $ $Date: 2008-07-22 12:34:32 $
 '*
 '* This file is part of OpenOffice.org.
 '*
@@ -308,14 +308,8 @@ testcase tMainMenuBar
         hMenuSelectNr(1) ' the file menu
         hMenuSelectNr(4) ' the autopilots menu        
         iCount = hMenuItemGetCount()
-        if (gOOO) then   
-            if (iCount <> 10) then
-                warnlog "There should 10 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
-            end if
-        else
-            if (iCount <> 8) then
-                warnlog "There should 8 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
-            end if
+        if (iCount <> 8) then
+            warnlog "There should 8 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
         endif
         call hMenuClose()
         
diff --git a/testautomation/dbaccess/required/includes/Query.inc b/testautomation/dbaccess/required/includes/Query.inc
index 29a9929e6422..c2c3ea12182f 100755
--- a/testautomation/dbaccess/required/includes/Query.inc
+++ b/testautomation/dbaccess/required/includes/Query.inc
@@ -8,9 +8,9 @@
 '*
 '* $RCSfile: Query.inc,v $
 '*
-'* $Revision: 1.1 $
+'* $Revision: 1.2 $
 '*
-'* last change: $Author: jsi $ $Date: 2008-06-16 07:43:45 $
+'* last change: $Author: obo $ $Date: 2008-07-22 12:34:44 $
 '*
 '* This file is part of OpenOffice.org.
 '*
@@ -837,14 +837,8 @@ testcase tMainMenuBar
         hMenuSelectNr(1) ' the file menu
         hMenuSelectNr(3) ' the autopilots menu        
         iCount = hMenuItemGetCount()        
-        if (gOOO) then  
-            if (iCount <> 10) then
-                warnlog "There should 10 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
-            end if
-        else
-            if (iCount <> 8) then
-                warnlog "There should 8 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
-            end if
+        if (iCount <> 8) then
+            warnlog "There should 8 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
         endif        
         call hMenuClose()
         
diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
index 37aaf5f850d5..e4c0915e325b 100755
--- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc
+++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
@@ -8,9 +8,9 @@
 '*
 '* $RCSfile: ReportBuilder01.inc,v $
 '*
-'* $Revision: 1.2 $
+'* $Revision: 1.3 $
 '*
-'* last change: $Author: obo $ $Date: 2008-07-21 12:31:42 $
+'* last change: $Author: obo $ $Date: 2008-07-22 12:34:57 $
 '*
 '* This file is part of OpenOffice.org.
 '*
@@ -106,14 +106,8 @@ testcase tMainMenuBar
         hMenuSelectNr(1) ' the file menu
         hMenuSelectNr(4) ' the autopilots menu        
         iCount = hMenuItemGetCount()
-        if (gOOO) then   
-            if (iCount <> 10) then
-                warnlog "There should 10 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
-            end if
-        else
-            if (iCount <> 8) then
-                warnlog "There should 8 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
-            end if
+        if (iCount <> 8) then
+            warnlog "There should 8 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
         endif
         call hMenuClose()
 
diff --git a/testautomation/dbaccess/required/includes/Table.inc b/testautomation/dbaccess/required/includes/Table.inc
index 1683d97bea3f..cfd6659c1f77 100755
--- a/testautomation/dbaccess/required/includes/Table.inc
+++ b/testautomation/dbaccess/required/includes/Table.inc
@@ -8,9 +8,9 @@
 '*
 '* $RCSfile: Table.inc,v $
 '*
-'* $Revision: 1.1 $
+'* $Revision: 1.2 $
 '*
-'* last change: $Author: jsi $ $Date: 2008-06-16 07:43:45 $
+'* last change: $Author: obo $ $Date: 2008-07-22 12:35:10 $
 '*
 '* This file is part of OpenOffice.org.
 '*
@@ -526,14 +526,8 @@ testcase tMainMenuBar
         hMenuSelectNr(1) ' the file menu
         hMenuSelectNr(3) ' the autopilots menu        
         iCount = hMenuItemGetCount()
-        if (gOOO) then    
-            if (iCount <> 10) then
-                warnlog "There should 10 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
-            end if
-        else
-            if (iCount <> 8) then
-                warnlog "There should 8 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
-            end if
+        if (iCount <> 8) then
+            warnlog "There should 8 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
         endif
         call hMenuClose()
         
diff --git a/testautomation/dbaccess/required/includes/TableDesign.inc b/testautomation/dbaccess/required/includes/TableDesign.inc
index f946098a2f61..f2132721c864 100755
--- a/testautomation/dbaccess/required/includes/TableDesign.inc
+++ b/testautomation/dbaccess/required/includes/TableDesign.inc
@@ -8,9 +8,9 @@
 '*
 '* $RCSfile: TableDesign.inc,v $
 '*
-'* $Revision: 1.1 $
+'* $Revision: 1.2 $
 '*
-'* last change: $Author: jsi $ $Date: 2008-06-16 07:43:45 $
+'* last change: $Author: obo $ $Date: 2008-07-22 12:35:23 $
 '*
 '* This file is part of OpenOffice.org.
 '*
@@ -405,14 +405,8 @@ testcase tMainMenuBar
         hMenuSelectNr(1) ' the file menu
         hMenuSelectNr(3) ' the autopilots menu        
         iCount = hMenuItemGetCount()
-        if (gOOO) then   
-            if (iCount <> 10) then
-                warnlog "There should 10 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
-            end if
-        else
-            if (iCount <> 8) then
-                warnlog "There should 8 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
-            end if
+        if (iCount <> 8) then
+            warnlog "There should 8 items in the FILE/AUTOPILOTS menu but there are " + iCount + " items."
         endif
         call hMenuClose()