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
author: Ivo Hinkelmann <ihi@openoffice.org> 2009-07-15 12:25:42 +0000
committer: Ivo Hinkelmann <ihi@openoffice.org> 2009-07-15 12:25:42 +0000
commit: f1ed767f925c9ac7f4fee9cf44d9a58a94f4185e (patch)
tree: aa5d4415cb86271d574726b0449ae4ac66f1d98e /testautomation/writer/optional/includes/formatpage/w_formatpage2.inc
parent: d0300a7ecb45232163e7d36a1a8fc2986f3d1a2d (diff)
1 files changed, 30 insertions, 32 deletions
diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc
index a8edee0e2..7c8724b0a 100755
--- a/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc
+++ b/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc
@@ -146,7 +146,8 @@ endcase
 testcase tFormatPage_17
 
     Dim sTestFile as String
-    Dim sDummy1 as String  ,  sDummy2 as String
+    Dim sDummy1 as String
+    Dim sDummy2 as String
 
     sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatpage\testForAutoFit.sxw")
 
@@ -447,9 +448,10 @@ testcase tFormatPage_20
     Sleep 2
     MenuSelect(Menugetitemid(4))
     Sleep 2
-    MenuSelect(Menugetitemid(9))
+    MenuSelect(Menugetitemid(10))
     Sleep 2
-    MenuSelect(Menugetitemid(3))
+    Call hMenuFindSelect (".uno:InsertPageFooter?PageStyle:string=Default&On:bool=true", true, 3, true)   'Find "Insert:Footer:Default" and call the slot.
+'    MenuSelect(Menugetitemid(3))
     Sleep 2
 
     '/// formatPage , tabpage footer
@@ -468,9 +470,9 @@ testcase tFormatPage_20
     '/// Set the bigger fonts to selection in the footer
     fFormatCharacter("TabFont")
     try
-        SizeWest.Select  SizeWest.GetItemCount-2
+        SizeWest.Select SizeWest.GetItemCount-2
     catch
-        Size.Select      Size.GetItemCount-2
+        Size.Select Size.GetItemCount-2
     endcatch
     TabFont.OK
 
@@ -500,20 +502,16 @@ endcase
 '-------------------------------------------------------------------------------------------
 
 testcase tFormatPage_21
-Warnlog "#i102452# - tFormatPage_21 outcommented. Something wrong in AutoFit Height."
-goto endsub
-
 
     Dim sTestFile as String
-    Dim sDummy1 as String  ,  sDummy2 as String
+    Dim sDummy1 as String
+    Dim sDummy2 as String
 
     sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatpage\testForAutoFit.sxw")
 
     PrintLog "- AutoFit height - Check (Footer,multiline content)"
     '/// AutoFit height - Check (Footer,multiline content)
 
-    Call hNewDocument
-
     '/// Open test file testForAutoFit.sxw
      Call hFileOpen(sTestFile)
      Call sMakeReadOnlyDocumentEditable
@@ -533,7 +531,7 @@ goto endsub
     
     '/// Remember number in line
     EditCopy
-    sDummy1 =  GetClipboardText
+    sDummy1 = GetClipboardText
 
     '/// Again 1 step up
     Call wTypeKeys "<Up>"
@@ -541,15 +539,15 @@ goto endsub
 
     '/// Remember number in current line
     EditCopy
-    sDummy2 =  GetClipboardText
-    
-    '/// Insert a footer
+    sDummy2 = GetClipboardText
+
+    printlog " Insert a footer"
     DocumentWriter.UseMenu
     MenuSelect(Menugetitemid(4))
     Sleep 2
-    MenuSelect(Menugetitemid(9))
+    MenuSelect(Menugetitemid(10))
     Sleep 2
-    MenuSelect(Menugetitemid(3))
+    Call hMenuFindSelect (".uno:InsertPageFooter?PageStyle:string=Default&On:bool=true", true, 3, true)   'Find "Insert:Footer:Default" and call the slot.
     Sleep 2
     
     '/// formatPage , tabpage footer
@@ -642,13 +640,14 @@ testcase tFormatPage_22
     sDummy =  GetClipboardText
 
     '/// Insert a footer
-     DocumentWriter.UseMenu
-     MenuSelect(Menugetitemid(4))
-     Sleep 2
-     MenuSelect(Menugetitemid(10))
-     Sleep 2
-     MenuSelect(Menugetitemid(3))
-     Sleep 2
+    DocumentWriter.UseMenu
+    MenuSelect(Menugetitemid(4))
+    Sleep 2
+    MenuSelect(Menugetitemid(10))
+    Sleep 2
+    Call hMenuFindSelect (".uno:InsertPageFooter?PageStyle:string=Default&On:bool=true", true, 3, true)   'Find "Insert:Footer:Default" and call the slot.
+'    MenuSelect(Menugetitemid(3))
+    Sleep 2
 
     '/// formatPage , tabpage footer ,UnCheck AutoFit Height
     fFormatPageWriter("TabFusszeile")
@@ -662,9 +661,9 @@ testcase tFormatPage_22
     '/// Set the bigger fonts to selection in the footer
     fFormatCharacter("TabFont")
     try
-        SizeWest.Select  SizeWest.GetItemCount-2
+        SizeWest.Select SizeWest.GetItemCount-2
     catch
-        Size.Select      Size.GetItemCount-2
+        Size.Select Size.GetItemCount-2
     endcatch
     TabFont.OK
     
@@ -703,8 +702,6 @@ testcase tFormatPage_23
     PrintLog "- AutoFit height - UnCheck (Footer,multiline content)"
     '/// AutoFit height - UnCheck (Footer,multiline content)
 
-    Call hNewDocument
-
     '/// Open test file testForAutoFit.sxw
     Call hFileOpen(sTestFile)
     Call sMakeReadOnlyDocumentEditable
@@ -732,7 +729,8 @@ testcase tFormatPage_23
     Sleep 2
     MenuSelect(Menugetitemid(10))
     Sleep 2
-    MenuSelect(Menugetitemid(3))
+    Call hMenuFindSelect (".uno:InsertPageFooter?PageStyle:string=Default&On:bool=true", true, 3, true)   'Find "Insert:Footer:Default" and call the slot.
+'    MenuSelect(Menugetitemid(3))
     Sleep 2
     
     '/// formatPage , tabpage footer ,Uncheck AutoFit Height
@@ -856,7 +854,7 @@ testcase tFormatPage_26
      DocumentWriter.UseMenu
      MenuSelect(Menugetitemid(4))
      Sleep 2
-     MenuSelect(Menugetitemid(9))
+     MenuSelect(Menugetitemid(10))
      Sleep 2
      MenuSelect(Menugetitemid(1))
      Sleep 2
@@ -894,7 +892,7 @@ testcase tFormatPage_27
      DocumentWriter.UseMenu
      MenuSelect(Menugetitemid(4))
      Sleep 2
-     MenuSelect(Menugetitemid(9))
+     MenuSelect(Menugetitemid(10))
      Sleep 2
      MenuSelect(Menugetitemid(1))
      Sleep 2
@@ -903,7 +901,7 @@ testcase tFormatPage_27
      DocumentWriter.UseMenu
      MenuSelect(Menugetitemid(4))
       Sleep 2
-     MenuSelect(Menugetitemid(9))
+     MenuSelect(Menugetitemid(10))
      Sleep 2
      MenuSelect(Menugetitemid(1))
      Sleep 2
author	Ivo Hinkelmann <ihi@openoffice.org>	2009-07-15 12:25:42 +0000
committer	Ivo Hinkelmann <ihi@openoffice.org>	2009-07-15 12:25:42 +0000
commit	f1ed767f925c9ac7f4fee9cf44d9a58a94f4185e (patch)
tree	aa5d4415cb86271d574726b0449ae4ac66f1d98e /testautomation/writer/optional/includes/formatpage/w_formatpage2.inc
parent	d0300a7ecb45232163e7d36a1a8fc2986f3d1a2d (diff)