CWS-TOOLING: integrate CWS fhawfixes2

2009-07-08 14:58:06 +0200 oc  r273832 : #i103413#
2009-07-01 22:02:46 +0200 fredrikh  r273615 : i103249
2009-07-01 17:12:45 +0200 fredrikh  r273605 : i103249
2009-07-01 16:55:27 +0200 fredrikh  r273603 : i102752
2009-07-01 16:51:30 +0200 fredrikh  r273602 : i102752
2009-07-01 15:49:58 +0200 fredrikh  r273597 : i102752
2009-07-01 15:32:34 +0200 fredrikh  r273596 : i103216
2009-07-01 15:10:05 +0200 fredrikh  r273590 : i102752
2009-07-01 14:41:23 +0200 fredrikh  r273587 : i102752
2009-07-01 14:40:11 +0200 fredrikh  r273585 : i102752
2009-07-01 13:14:31 +0200 fredrikh  r273572 : i102752
2009-07-01 13:02:47 +0200 fredrikh  r273570 : i102752
2009-07-01 12:54:54 +0200 fredrikh  r273569 : i102752
2009-07-01 12:24:23 +0200 fredrikh  r273567 : i102752
2009-07-01 12:23:10 +0200 fredrikh  r273566 : i102752
2009-07-01 12:22:06 +0200 fredrikh  r273565 : i102752
2009-07-01 12:13:26 +0200 fredrikh  r273563 : i102752
2009-06-30 18:00:13 +0200 fredrikh  r273530 : i103220
2009-06-30 17:52:06 +0200 fredrikh  r273528 : i102845
2009-06-30 17:36:50 +0200 fredrikh  r273526 : CWS-TOOLING: rebase CWS fhawfixes2 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 11:36:55 +0200 fredrikh  r273499 : CWS-TOOLING: rebase CWS fhawfixes2 to trunk@272827 (milestone: DEV300:m50)
2009-06-29 14:12:15 +0200 fredrikh  r273473 : i94734
2009-06-24 18:59:13 +0200 fredrikh  r273362 : i102846
2009-06-24 16:01:32 +0200 fredrikh  r273352 : i102999
2009-06-24 14:33:37 +0200 fredrikh  r273347 : i103063 & i102999
2009-06-24 14:32:18 +0200 fredrikh  r273346 : i103063
2009-06-24 14:17:42 +0200 fredrikh  r273345 : i103063
2009-06-24 13:38:39 +0200 fredrikh  r273341 : i103063
2009-06-24 13:38:15 +0200 fredrikh  r273340 : i103063
2009-06-24 13:37:32 +0200 fredrikh  r273339 : i103063
2009-06-24 13:36:43 +0200 fredrikh  r273338 : i103063
2009-06-24 13:36:26 +0200 fredrikh  r273337 : i103063
2009-06-24 13:36:08 +0200 fredrikh  r273336 : i103063
2009-06-24 13:32:08 +0200 fredrikh  r273335 : i103063
2009-06-24 02:01:29 +0200 fredrikh  r273305 : i102999
2009-06-23 17:07:02 +0200 fredrikh  r273298 : i103042
2009-06-23 17:06:17 +0200 fredrikh  r273297 : i103042
2009-06-23 16:27:47 +0200 fredrikh  r273295 : i102999
2009-06-23 16:26:46 +0200 fredrikh  r273294 : i102999
2009-06-23 16:26:20 +0200 fredrikh  r273293 : i102999
2009-06-23 16:25:37 +0200 fredrikh  r273291 : i102999
2009-06-23 16:24:52 +0200 fredrikh  r273290 : i102999
2009-06-23 16:24:05 +0200 fredrikh  r273288 : i102999
2009-06-23 16:23:49 +0200 fredrikh  r273287 : i102999
2009-06-23 14:46:08 +0200 fredrikh  r273282 : i102999
2009-06-23 13:18:56 +0200 fredrikh  r273279 : i102999
2009-06-22 18:17:33 +0200 fredrikh  r273250 : i102999
2009-06-22 18:17:10 +0200 fredrikh  r273249 : i102999
2009-06-22 18:16:48 +0200 fredrikh  r273248 : i102999
2009-06-22 18:16:33 +0200 fredrikh  r273247 : i102999
2009-06-22 18:16:07 +0200 fredrikh  r273246 : i102999
2009-06-22 18:15:32 +0200 fredrikh  r273245 : i102999
2009-06-22 16:14:00 +0200 fredrikh  r273237 : i102792
2009-06-22 13:35:09 +0200 fredrikh  r273228 : i102648
2009-06-22 12:19:41 +0200 fredrikh  r273211 : i102800
2009-06-18 17:57:17 +0200 fredrikh  r273127 : i102800
2009-06-17 19:01:42 +0200 fredrikh  r273092 : i102800
2009-06-17 14:28:32 +0200 fredrikh  r273073 : i102800
2009-06-17 13:16:26 +0200 fredrikh  r273061 : i102800
2009-06-17 13:14:19 +0200 fredrikh  r273060 : i102800
2009-06-17 12:20:47 +0200 fredrikh  r273058 : i102800
2009-06-16 23:56:39 +0200 fredrikh  r273043 : i102800
2009-06-16 19:01:53 +0200 fredrikh  r273036 : i102800
2009-06-15 17:53:18 +0200 fredrikh  r273005 : i102800
2009-06-15 17:19:25 +0200 fredrikh  r273003 : i102800
2009-06-15 15:57:40 +0200 fredrikh  r272993 : i102799
2009-06-15 15:11:05 +0200 fredrikh  r272990 : i102648
2009-06-15 15:09:56 +0200 fredrikh  r272989 : i102648
2009-06-15 14:48:42 +0200 fredrikh  r272988 : i102648
2009-06-15 12:41:32 +0200 fredrikh  r272977 : i102648
2009-06-15 12:27:09 +0200 fredrikh  r272975 : i102648
2009-06-10 17:31:22 +0200 fredrikh  r272831 : i102648
2009-06-10 15:47:16 +0200 fredrikh  r272823 : i102647
2009-06-10 13:21:24 +0200 fredrikh  r272805 : i102639 + i96954

1 files changed, 45 insertions, 43 deletions

diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc
index 6d66e5b6be63..485798cd3c56 100755
--- a/testautomation/writer/optional/includes/option/wr_o_4.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_4.inc
@@ -96,7 +96,7 @@ testcase tToolsOptionsWriterOther
 
     printlog ("'/// - all states inverting ///")
 
-    if irgendwas(2) Then Feldbefehle.UnCheck                         Else Feldbefehle.Check
+    if irgendwas(2) Then Feldbefehle.UnCheck Else Feldbefehle.Check
     if Feldbefehle.IsChecked  Then if irgendwas(3) Then Diagramme.UnCheck Else Diagramme.Check
 
     if (Immer.IsChecked = True) Then AufNachfrage.Check Else Immer.Check
@@ -299,9 +299,9 @@ testcase tToolsOptionsWriterOther
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-	Do Until GetDocumentCount = 0
-    	Call hCloseDocument
-	Loop
+    Do Until GetDocumentCount = 0
+        Call hCloseDocument
+    Loop
 endcase
 
 '------------------------------------------------------------------------------
@@ -413,7 +413,7 @@ testcase tToolsOptionsWriterAutoCaption
     ' checking Listentry '(7) = StarOffice 6.0 Impress' completely
 
     dim vObjectList(10) as integer
-    dim vObjectListDescription(10) as string    
+    dim vObjectListDescription(10) as string
     Dim vCategory(10) as integer
     Dim vCategoryTmp(10) as string
     Dim vNumbering(10) as integer
@@ -438,7 +438,7 @@ testcase tToolsOptionsWriterAutoCaption
 
     NumberOfObjects = ObjectList.GetItemCount
     Select Case gPlatGroup
-        Case "w95"        
+        Case "w95"
             if (NumberOfObjects <> 9) then
                 warnlog "Number of Object List is not correct"
             end if
@@ -447,7 +447,7 @@ testcase tToolsOptionsWriterAutoCaption
                 warnlog "Number of Object List is not correct"
             end if
     end select
-            
+
     for i=1 to NumberOfObjects
         ObjectList.Select (i)
         vObjectList(i) = ObjectList.IsChecked
@@ -497,7 +497,7 @@ testcase tToolsOptionsWriterAutoCaption
             ObjectList.Check
         end if
     next i
-   
+
     printlog ("'/// - change states ///")
     '/// look if properties get saved for each list item
     for i=1 to NumberOfObjects
@@ -557,7 +557,7 @@ testcase tToolsOptionsWriterAutoCaption
     ExtrasOptionenDlg.OK
 
     printlog ("'/// - SO quit - start ///")
-    
+
     Call wOfficeRestart
 
     printlog ("'/// - checking states ///")
@@ -566,7 +566,7 @@ testcase tToolsOptionsWriterAutoCaption
     Kontext "TabAutoCaption"
     for i=1 to NumberOfObjects
         printlog "-   checking: " & ObjectList.Gettext
-        ObjectList.Select (i) 
+        ObjectList.Select (i)
 		wait 500
         if ObjectList.IsChecked Then
             if i <= 7 then
@@ -590,7 +590,7 @@ testcase tToolsOptionsWriterAutoCaption
                 Warnlog "-    'Level' changed after restart"
             else
                 Printlog "-    'Level' => ok"
-            end if            
+            end if
             if CharacterStyle.GetSelIndex <> i then
                 Warnlog "-    'Character Style' changed after restart"
             else
@@ -602,7 +602,7 @@ testcase tToolsOptionsWriterAutoCaption
             else
                 printlog "-    'Category' => ok"
             end if
-            
+
             Select Case i
                 case 1:
                     if Position.GetSelIndex <> 1 then
@@ -637,28 +637,28 @@ testcase tToolsOptionsWriterAutoCaption
                     else
                         printlog "-    'Position' => ok"
                     end if
-                    
+
                 case 5:
                     if Position.GetSelIndex <> 1 then
                         Warnlog "-    'Position' changed after restart"
                     else
                         printlog "-    'Position' => ok"
                     end if
-                    
+
                 case 6:
                     if Position.GetSelIndex <> 2 then
                         Warnlog "-    'Position' changed after restart"
                     else
                         printlog "-    'Position' => ok"
                     end if
-                    
+
                 case 7:
                     if Position.GetSelIndex <> 1 then
                         Warnlog "-    'Position' changed after restart"
                     else
                         printlog "-    'Position' => ok"
                     end if
-                    
+
                 case 8:
                     if Numbering.GetItemCount > 7 then
                         if Numbering.GetSelIndex <> Numbering.GetItemCount then
@@ -679,7 +679,7 @@ testcase tToolsOptionsWriterAutoCaption
                     else
                         printlog "-    'Position' => ok"
                     end if
-                    
+
                 case 9:
                     if Numbering.GetItemCount > 7 then
                         if Numbering.GetSelIndex <> Numbering.GetItemCount then
@@ -700,13 +700,13 @@ testcase tToolsOptionsWriterAutoCaption
                     else
                         printlog "-    'Position' => ok"
                     end if
-                    
+
             end select
         else
             Warnlog "-   " & ObjectList.GetText & " is not checked"
         end if
-    next i    
-    
+    next i
+
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
@@ -717,7 +717,7 @@ testcase tToolsOptionsWriterAutoCaption
     Kontext "TabAutoCaption"
 
     for i=1 to NumberOfObjects
-        ObjectList.Select (i)              
+        ObjectList.Select (i)
         if ObjectList.IsChecked then
             if vCategory(i) > Category.GetItemCount then
                 Category.Select Category.GetItemCount
@@ -738,7 +738,7 @@ testcase tToolsOptionsWriterAutoCaption
                         ApplyBorderAndShadow.Uncheck
                 end select
             end if
-        end if    
+        end if
         Select case vObjectList(i)
             Case true
                 ObjectList.Check
@@ -751,9 +751,9 @@ testcase tToolsOptionsWriterAutoCaption
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-	Do Until GetDocumentCount = 0
-    	Call hCloseDocument
-	Loop
+    Do Until GetDocumentCount = 0
+        Call hCloseDocument
+    Loop
 endcase
 
 '------------------------------------------------------------------------------
@@ -762,6 +762,7 @@ testcase tToolsOptionsWriterGeneral
     Dim i as integer
     Dim ist_aktualisiert as boolean
     Dim CompareThis as string
+
     ' State is saved with document. Thats why I use 3 docs
     Call hNewDocument
     printlog "'///- Extras / Optionen / Sonstiges / Verkn?pfungen aktualisieren ///"
@@ -861,9 +862,10 @@ testcase tToolsOptionsWriterGeneral
     AufNachfrage.Check
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
-	Do Until GetDocumentCount = 0
-    	Call hCloseDocument
-	Loop
+
+    Do Until GetDocumentCount = 0
+        Call hCloseDocument
+    Loop
 endcase
 
 '------------------------------------------------------------------------------
@@ -880,17 +882,17 @@ testcase tToolsOptionsWriterMailMerge
     '/// Fill out all fields
     printlog " - fill out Mail Settings"
     Kontext "TabMailMergeEmail"
-    YourName.Settext "Helge Delfs"
+    YourName.Settext "Fredrik Haegg"
     EmailAddress.Settext "fredrik.haegg@sun.com"
     SendReplies.Check
-    ReplyAddress.Settext "hde@openoffice.org"
+    ReplyAddress.Settext "fredrikh@openoffice.org"
     ServerName.Settext "MySMTP-Server"
     UseSecure.Check
     
     '/// Change details for Server Authentication
     printlog " - fill out Authentication Settings"
     ServerAuthentication.Click
-    wait 500    
+    wait 500
     Kontext "ServerAuthentication"
     SMTPauthentication.Check
     
@@ -899,8 +901,8 @@ testcase tToolsOptionsWriterMailMerge
     Port.Settext "111"
     IMAP.Check
     User.Settext "MyAuthenticationUserName"
-    Password.Settext "MyAuthenticationPassword"    
-    ServerAuthentication.Ok   
+    Password.Settext "MyAuthenticationPassword"
+    ServerAuthentication.Ok
     
     '/// Close 'Server Authentication dialog, reopen and check values set
     printlog " - check settings"
@@ -908,7 +910,7 @@ testcase tToolsOptionsWriterMailMerge
     ServerAuthentication.Click
     wait 500
     Kontext "ServerAuthentication"
-    if Not SMTPauthentication.IsChecked then Warnlog "SMTP Authentication is not checked anymore"    
+    if Not SMTPauthentication.IsChecked then Warnlog "SMTP Authentication is not checked anymore"
     if Not IncomingMailServer.IsChecked then Warnlog "Incoming Mail Server has been changed"
     if Server.Gettext <> "MySMTP-Server" then Warnlog "Servername has been changed"
     if Port.Gettext <> "111" then Warnlog "Server Port has been changed"
@@ -925,7 +927,7 @@ testcase tToolsOptionsWriterMailMerge
     '/// Close options dialog and restart the office
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.Ok
-    printlog " - restart office"  
+    printlog " - restart office"
     Call wOfficeRestart
 
     '/// Reopen Tools/Options and check settings
@@ -934,10 +936,10 @@ testcase tToolsOptionsWriterMailMerge
     Call hToolsOptions ("WRITER","MailMergeEMail")
 
     Kontext "TabMailMergeEmail"
-    if YourName.Gettext <> "Helge Delfs" then Warnlog "'Your Name' has been changed after a restart"
+    if YourName.Gettext <> "Fredrik Haegg" then Warnlog "'Your Name' has been changed after a restart"
     if EmailAddress.Gettext <> "fredrik.haegg@sun.com" then Warnlog "'Email Address' has been changed after a restart"
     if Not SendReplies.IsChecked then Warnlog "'Send replies' has been changed after a restart"
-    if ReplyAddress.Gettext <> "hde@openoffice.org" then Warnlog "'Reply adresses' has been changed after a restart"
+    if ReplyAddress.Gettext <> "fredrikh@openoffice.org" then Warnlog "'Reply adresses' has been changed after a restart"
     if ServerName.Gettext <> "MySMTP-Server" then Warnlog "'Server name' has been changed after a restart"
     if UseSecure.IsChecked = false then Warnlog "'Secure' has been changed after a restart"
 
@@ -955,7 +957,7 @@ testcase tToolsOptionsWriterMailMerge
     TestSettings.Click
     
     Kontext "TestAccountSettings"
-    Do 
+    Do
         if TaskStatusListBox.GetItemCount > 0 then
             TestAccountSettings.Cancel
             exit do
@@ -980,8 +982,7 @@ testcase tToolsOptionsWriterMailMerge
     OutgoingPassword.Settext ""
 
     SMTPauthentication.UnCheck
-    
-    ServerAuthentication.Ok   
+    ServerAuthentication.Ok
 
     Kontext "TabMailMergeEmail"
     YourName.Settext ""
@@ -995,7 +996,8 @@ testcase tToolsOptionsWriterMailMerge
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.Ok
 
-	Do Until GetDocumentCount = 0
-    	Call hCloseDocument
-	Loop
+    Do Until GetDocumentCount = 0
+        Call hCloseDocument
+    Loop
 endcase
+'------------------------------------------------------------------------------