CWS-TOOLING: integrate CWS dba31e

2008-11-19 12:36:23 +0100 msc  r263980 : i96104
2008-11-19 12:31:19 +0100 msc  r263979 : i96104
2008-11-19 12:21:55 +0100 msc  r263977 : i96104
2008-11-19 12:18:53 +0100 msc  r263976 : i96104
2008-11-18 09:09:45 +0100 oj  r263746 : disable color entry when area is set
2008-11-18 08:37:52 +0100 oj  r263741 : #remove sub report entry
2008-11-17 11:20:25 +0100 fs  r263708 : #i10000#
2008-11-17 11:06:52 +0100 fs  r263706 : minimal version now is 3.1
2008-11-12 22:25:59 +0100 fs  r263621 : #i96150#
2008-11-12 22:20:02 +0100 fs  r263620 : rebased to m34
2008-11-12 21:39:41 +0100 fs  r263618 : MANUAL REBASE: rebase CWS dba31d to DEV300_m34
2008-11-12 13:54:58 +0100 fs  r263597 : #i96134# MediaDescriptor.URL is to be preferred over MediaDescriptor.FileName. Nonetheless, ensure both are handled
2008-11-12 13:53:40 +0100 fs  r263596 : #i96134# re-enabled the code for #i41897#, a better fix is to come
2008-11-12 12:48:21 +0100 fs  r263585 : #i96134# disable saving URLs of file-base databases relatively
2008-11-11 16:11:11 +0100 msc  r263566 : #i96104#
2008-11-05 09:09:47 +0100 oj  r263342 : #i88727# color noe added
2008-11-05 08:41:43 +0100 oj  r263341 : #i77916# zoom added
2008-11-04 21:24:15 +0100 fs  r263339 : disposing: call disposeAndClear without own mutex locked - some of our listeners insist on locking the SolarMutex, which sometimes led to deadlocks on the complex test cases
2008-11-04 21:23:15 +0100 fs  r263338 : remove SolarMutex locking - this happned in CWS dba31c (in the CVS version), which this CWS was created from, but seems to got lost during resync
2008-11-04 20:49:50 +0100 fs  r263335 : docu formatting
2008-11-04 20:06:39 +0100 fs  r263334 : #i95826# use m_aMutex, not a DocumentGuard (wrongly resolved merge conflicts)
2008-11-04 17:36:29 +0100 fs  r263332 : #i92688# properly revoke as XEventListener from m_xActiveController when disposing
2008-11-04 14:49:34 +0100 fs  r263324 : #i92322# enable Input Required if EmptyIsNULL does not exist at the control
2008-10-31 11:10:04 +0100 oj  r262857 : merge from cvs to svn
2008-10-31 09:46:45 +0100 oj  r262853 : merge from cvs to svn
2008-10-31 08:46:37 +0100 oj  r262849 : merge from cvs to svn
2008-10-31 08:44:24 +0100 oj  r262848 : merge from cvs to svn
2008-10-31 08:43:33 +0100 oj  r262847 : merge from cvs to svn
2008-10-31 08:42:28 +0100 oj  r262846 : merge from cvs to svn
2008-10-31 08:41:58 +0100 oj  r262845 : merge from cvs to svn
2008-10-31 08:41:32 +0100 oj  r262844 : merge from cvs to svn
2008-10-28 12:19:50 +0100 oj  r262733 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:42 +0100 oj  r262732 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:36 +0100 oj  r262731 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:31 +0100 oj  r262730 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:22 +0100 oj  r262729 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:18 +0100 oj  r262728 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:10 +0100 oj  r262727 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:06 +0100 oj  r262726 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:05 +0100 oj  r262725 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:01 +0100 oj  r262724 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:50 +0100 oj  r262723 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:41 +0100 oj  r262722 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:40 +0100 oj  r262721 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:27 +0100 oj  r262720 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:10 +0100 oj  r262719 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:01 +0100 oj  r262718 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:17:39 +0100 oj  r262717 : #iXXXXX#: migrate CWS dba31e to SVN

8 files changed, 34 insertions, 32 deletions

diff --git a/qadevOOo/runner/convwatch/ReportDesignerTest.java b/qadevOOo/runner/convwatch/ReportDesignerTest.java
index 18633da7b..7212500df 100755
--- a/qadevOOo/runner/convwatch/ReportDesignerTest.java
+++ b/qadevOOo/runner/convwatch/ReportDesignerTest.java
@@ -416,8 +416,8 @@ public class ReportDesignerTest extends ComplexTestCase {
 //                     log.println("3");
                 
                 XDatabaseDocumentUI aDBDocUI = (XDatabaseDocumentUI)UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
-                boolean isConnect = aDBDocUI.connect();
-//                     if (isConnect)
+                aDBDocUI.connect();
+//                     if (aDBDocUI.isConnected())
 //                     {
 //                         System.out.println("true");
 //                     }
diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
index fb8c00d3f..9793ce6f5 100644
--- a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
+++ b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
@@ -351,9 +351,8 @@ public class OpenOfficeDatabaseReportExtractor extends Assurance
 //                GlobalLogWriter.get().println("3");
                 
                 XDatabaseDocumentUI aDBDocUI = (XDatabaseDocumentUI)UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
-                boolean isDummy = aDBDocUI.isConnected();
-                boolean blah = isDummy;
-                boolean isConnect = aDBDocUI.connect();
+                aDBDocUI.connect();
+                boolean isConnect = aDBDocUI.isConnected();
                 if (isConnect)
                 {
                     GlobalLogWriter.println("Connection is true");
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
index bdd2d31b9..107e68bce 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
@@ -8,9 +8,9 @@
 '*
 '* $RCSfile: ctrl_Several1.inc,v $
 '*
-'* $Revision: 1.1 $
+'* $Revision: 1.1.68.1 $
 '*
-'* last change: $Author: jsi $ $Date: 2008-06-16 07:43:41 $
+'* last change: $Author: msc $ $Date: 2008/10/07 09:51:29 $
 '*
 '* This file is part of OpenOffice.org.
 '*
diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc
index faecfe598..64d8f4f86 100755
--- a/testautomation/dbaccess/required/includes/MainApp.inc
+++ b/testautomation/dbaccess/required/includes/MainApp.inc
@@ -378,13 +378,13 @@ testcase tMainMenuBar
         end if
         call hMenuClose()
 
-        '/// check if there are 9 items in the tools menu.
-        printlog "check if there are 9 items in the tools menu."        
+        '/// check if there are 10 items in the tools menu.
+        printlog "check if there are 10 items in the tools menu."        
         Insight.UseMenu 
         hMenuSelectNr(5)        
         iCount = hMenuItemGetCount()
-        if (iCount <> 9) then
-            warnlog "There should 9 items in the tools menu but there are " + iCount + " items."
+        if (iCount <> 10) then
+            warnlog "There should 10 items in the tools menu but there are " + iCount + " items."
         end if
         call hMenuClose()
         
@@ -392,7 +392,7 @@ testcase tMainMenuBar
         printlog "check if there are 4 items in the TOOLS/MACRO menu."        
         Insight.UseMenu 
         hMenuSelectNr(5)
-        hMenuSelectNr(5)        
+        hMenuSelectNr(6)        
         iCount = hMenuItemGetCount()
         if (iCount <> 4) then
             warnlog "There should 4 items in the TOOLS/MACRO menu but there are " + iCount + " items."
diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
index 62902a9fa..fc60c5d3f 100755
--- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc
+++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
@@ -114,13 +114,13 @@ testcase tMainMenuBar
 
  'edit menu        
         
-        '/// check if there are 12 items in the edit menu.
-        printlog "check if there are 12 items in the edit menu."
+        '/// check if there are 11 items in the edit menu.
+        printlog "check if there are 11 items in the edit menu."
         ReportDesign.UseMenu 
         hMenuSelectNr(2)        
         iCount = hMenuItemGetCount()
-        if (iCount <> 12) then
-            warnlog "There should 12 items in the edit menu but there are " + iCount + " items."
+        if (iCount <> 11) then
+            warnlog "There should 11 items in the edit menu but there are " + iCount + " items."
         end if
         call hMenuClose()
 
@@ -323,7 +323,7 @@ testcase tExecuteReport
     Kontext "ReportDesign"
         ReportDesign.UseMenu            
         hMenuSelectNr(2)
-        hMenuSelectNr(12)
+        hMenuSelectNr(11)
        
     sleep(10)
     
@@ -475,7 +475,7 @@ testcase tGroupingSorting
     Kontext "ReportDesign"
         ReportDesign.UseMenu
         hMenuSelectNr(3)
-        hMenuSelectNr(5) 
+        hMenuSelectNr(4) 
         
     '/// check if the sorting and grouping dialog appear
     printlog "check if the sorting and grouping dialog appear"    
@@ -526,7 +526,7 @@ testcase tReportNavigator
     Kontext "ReportDesign"
         ReportDesign.UseMenu
         hMenuSelectNr(3)
-        hMenuSelectNr(6) 
+        hMenuSelectNr(5) 
         
     '/// check if the report navigator appear
     printlog "check if the report navigator appear"    
diff --git a/testautomation/dbaccess/tools/controltools.inc b/testautomation/dbaccess/tools/controltools.inc
index ea1423f86..a5efe6aa2 100755
--- a/testautomation/dbaccess/tools/controltools.inc
+++ b/testautomation/dbaccess/tools/controltools.inc
@@ -8,9 +8,9 @@
 '*
 '* $RCSfile: controltools.inc,v $
 '*
-'* $Revision: 1.1 $
+'* $Revision: 1.1.68.1 $
 '*
-'* last change: $Author: jsi $ $Date: 2008-06-16 07:43:45 $
+'* last change: $Author: msc $ $Date: 2008/10/28 07:52:48 $
 '*
 '* This file is part of OpenOffice.org.
 '*
diff --git a/testautomation/dbaccess/tools/reporttools.inc b/testautomation/dbaccess/tools/reporttools.inc
index 8af89c4e9..7f5de6df4 100755
--- a/testautomation/dbaccess/tools/reporttools.inc
+++ b/testautomation/dbaccess/tools/reporttools.inc
@@ -253,8 +253,8 @@ function fOpenReportNavigator
     Kontext "ReportDesign"     
         ReportDesign.UseMenu
         hMenuSelectNr(3)
-        if (hMenuItemIsChecked(6) = false) then
-            hMenuSelectNr(6)
+        if (hMenuItemIsChecked(5) = false) then
+            hMenuSelectNr(5)
         else
             'nothing
         endif
@@ -287,7 +287,7 @@ function fExecuteReport
     Kontext "ReportDesign"     
         ReportDesign.UseMenu
         hMenuSelectNr(2)
-        hMenuSelectNr(12)
+        hMenuSelectNr(11)
         
 end function
 '--------------------------------------------------------------------
@@ -315,8 +315,8 @@ function fCloseAddFieldDialog
             Kontext "ReportDesign"
                 ReportDesign.UseMenu
                 hMenuSelectNr(3)
-                if (hMenuItemIsChecked(4)) then
-                    hMenuSelectNr(4)
+                if (hMenuItemIsChecked(3)) then
+                    hMenuSelectNr(3)
                 else
                     warnlog "there should be the Add field dialog. But there is none."
                 endif
@@ -334,11 +334,11 @@ function fOpenAddFieldDialog
             Kontext "ReportDesign"
                 ReportDesign.UseMenu
                 hMenuSelectNr(3)
-                if (hMenuItemIsChecked(4)) then
-                    hMenuSelectNr(4)
+                if (hMenuItemIsChecked(3)) then
+                    hMenuSelectNr(3)
                     ReportDesign.UseMenu
 	                hMenuSelectNr(3)    
-                    hMenuSelectNr(4)
+                    hMenuSelectNr(3)
                     printlog "1"
                 else
                     hMenuSelectNr(4)
@@ -387,4 +387,7 @@ function tools_reporttools_InstallExtension
         tools_reporttools_InstallExtension = 0    
     endif
     
+    ' restart the office
+    call ExitRestartTheOffice
+    
 end function
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index fe2d0540e..57e222daf 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -148,15 +148,15 @@ test:
     
 $(DLLDEST)$/uno_types.rdb : $(SOLARBINDIR)$/udkapi.rdb
     echo $(DLLDEST)
-    $(GNUCOPY) -p $? $@
+    $(GNUCOPY) $? $@
     $(REGMERGE) $@ / $(BIN)$/bridgetest.rdb
 
 $(DLLDEST)$/bridgetest_inprocess$(BATCH_SUFFIX) : bridgetest_inprocess
-    $(GNUCOPY) -p $? $@
+    $(GNUCOPY) $? $@
     $(GIVE_EXEC_RIGHTS) $@
 
 $(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) : bridgetest_client
-    $(GNUCOPY) -p $? $@
+    $(GNUCOPY) $? $@
     $(GIVE_EXEC_RIGHTS) $@
 
 $(DLLDEST)$/bridgetest_server$(BATCH_SUFFIX) : bridgetest_server