1. mst
  2. ooo340

Commits

Joerg Skottke [jsk]  committed 4f00012 Merge

automationdev300m87: Local merge

  • Participants
  • Parent commits 77279b5, 661b6a7
  • Branches default

Comments (0)

Files changed (6)

File testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc

View file
  • Ignore whitespace
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_1
+testcase tGroup_1
 
     PrintLog "- Generate a objects group via menu Format/Group/Group"
 
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_2
+testcase tGroup_2
 
     PrintLog "- Generate a objects group via contextmenu Format/Group/Group"
 
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_3
+testcase tGroup_3
 
     PrintLog "- Menu entries may not be enabled if less then two objects are selected."
 
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_4
+testcase tGroup_4
 
     Dim sGroupName as String
 
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_5
+testcase tGroup_5
 
     Dim sGroupName as String
 
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_6
+testcase tGroup_6
 
     Dim sPositionX1 as String
     Dim sPositionY1 as String
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_7
+testcase tGroup_7
 
     Dim sPositionX1 as String
     Dim sPositionY1 as String
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_8
+testcase tGroup_8
 
     Dim sPositionX as String
     Dim sPositionY as String
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_9
+testcase tGroup_9
 
     Dim sPositionX as String
     Dim sPositionY as String
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_10
+testcase tGroup_10
 
     PrintLog "- create new objects inside the group ,"
     PrintLog "  Undo new created objects before leaving the group"
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_11
+testcase tGroup_11
 
     PrintLog "- create new objects inside the group ,"
     PrintLog "  Undo new created objects after leaving the group"
 
 '-------------------------------------------------------------------------
 
-testcase  tGroup_12
+testcase tGroup_12
 
     Dim sDocument as String
 
     Call hCloseDocument
     
       PrintLog "- Open previous saved document "
-    hFileOpenLocally( sDocument)
+    Call hFileOpen( sDocument)
     
     Kontext "DocumentWriter"
     Call gMouseClick(34,34)    'set focus in the group
 
 '-------------------------------------------------------------------------
 
-testcase  tEncapsulatedGroup_1
+testcase tEncapsulatedGroup_1
 
     PrintLog "- Group objects inside the group ,Encapsulated Group"
     

File testautomation/writer/optional/includes/option/wr_o_2.inc

View file
  • Ignore whitespace
     if bCheckboxes(10) then LeereSeitenDrucken.UnCheck else LeereSeitenDrucken.Check
     if bCheckboxes(11) then AusDruckereinstellung.UnCheck  else AusDruckereinstellung.Check
 
-    if (Keine.IsChecked = True) then NurNotizen.Check else Keine.Check
+    if Keine.IsEnabled then
+        if (Keine.IsChecked = True) then
+            NurNotizen.Check
+        else
+            Keine.Check
+        endif
+    endif
 
     bTempRadioBut(1) = Keine.IsChecked
     bTempRadioBut(2) = NurNotizen.IsChecked
     LeereSeitenDrucken.UnCheck
     AusDruckereinstellung.UnCheck
 
-    if (NurNotizen.IsChecked = True) then Dokumentende.Check else NurNotizen.Check
+    if NurNotizen.IsEnabled then
+        if (NurNotizen.IsChecked = True) then
+            Dokumentende.Check
+        else
+            NurNotizen.Check
+        endif
+    endif
 
     bTempRadioBut(1) = Keine.IsChecked
     bTempRadioBut(2) = NurNotizen.IsChecked
     LeereSeitenDrucken.Check
     AusDruckereinstellung.Check
 
-    if (Dokumentende.IsChecked = True) then Seitenende.Check else Dokumentende.Check
+    if Dokumentende.IsEnabled then
+        if (Dokumentende.IsChecked = True) then
+            Seitenende.Check
+        else
+            Dokumentende.Check
+        endif
+    endif
 
     bTempRadioBut(1) = Keine.IsChecked
     bTempRadioBut(2) = NurNotizen.IsChecked

File testautomation/writer/optional/includes/option/wr_o_3.inc

View file
  • Ignore whitespace
 '------------------------------------------------------------------------------------------------------------
 testcase tToolsOptionsWriterCompatibility3
 
-DIM iWords_to_right     AS integer 'variable for counting word-steps
-DIM iOptionsCount       AS integer 'variable for counting options on cmopatibility page
-DIM sDocument           AS string  'variable for saving the doc
-DIM sFoundWord          AS string  'variable for word found one line below
+    DIM iWords_to_right     AS integer 'variable for counting word-steps
+    DIM iOptionsCount       AS integer 'variable for counting options on cmopatibility page
+    DIM sDocument           AS string  'variable for saving the doc
+    DIM sFoundWord          AS string  'variable for word found one line below
 
     printlog ">>> Configuration of behavior when a line break is inserted <<<"
     '/// New Writer Doc
     ExtrasOptionenDLG.Cancel
 
     printlog "Reload recently saved document"
-    hFileOpenLocally( sDocument)
+    hFileOpen( sDocument)
 
     printlog "Tools-Options-OOo Writer-Compatibility"
     ToolsOptions

File testautomation/writer/optional/includes/option/wr_o_4.inc

View file
  • Ignore whitespace
 
 testcase tToolsOptionsWriterMailMerge
 
-    warnlog( "#i111914# - Test excluded, needs review" )
-    goto endsub
-
     Call hNewDocument
     printlog ("- Tools/Options/Writer: Mail Merge ")
     Kontext "Navigator"

File testautomation/writer/optional/includes/regexp/search.inc

View file
  • Ignore whitespace
 
 '---------------------------------------------------------
 testcase tCheckDialog
-    warnlog( "#i111908# - Control <Replace> cannot be accessed" )
-    goto endsub
     
- Dim Checkboxtitel
+    Dim Checkboxtitel
    Call hNewDocument
    EditSearchAndReplace
    Sleep 2

File testautomation/writer/required/includes/w_001b_.inc

View file
  • Ignore whitespace
     FileClose
     WaitSlot(2000)
     PrintLog "Open previous saved document"
-    hFileOpenLocally( Datei$)
+    Call hFileOpen( Datei$)
 
     Kontext "PasswordFileOpen"
     PrintLog "Enter a wrong password."
 
     Sleep 1
     PrintLog "File / Open again your previous saved document"
-    hFileOpenLocally( Datei$)
+    Call hFileOpen( Datei$)
     PrintLog "Enter your password in password dialog"
     Kontext "PasswordFileOpen"
     if PasswordFileOpen.Exists then
     endif
 
     PrintLog "Open previous saved document"
-    hFileOpenLocally(  sDocumentPath )
+    Call hFileOpen(  sDocumentPath )
     
     PrintLog "Insert a table in document"
     Call hTabelleEinfuegen