cws tl74: merge

3 files changed, 6 insertions, 71 deletions

diff --git a/testautomation/spreadsheet/required/c_updt1.bas b/testautomation/spreadsheet/required/c_updt1.bas
index af3ea7596374..076b247a82ad 100755
--- a/testautomation/spreadsheet/required/c_updt1.bas
+++ b/testautomation/spreadsheet/required/c_updt1.bas
@@ -69,6 +69,10 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     use "global\tools\includes\optional\t_locale_tools.inc"
+    use "global\tools\includes\optional\t_docfuncs.inc"
+    use "global\tools\includes\optional\t_control_objects.inc"
+    use "global\required\includes\g_printing.inc"
+    
     gApplication   = "CALC"
     GetUseFiles ()
 end sub
diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
index 1220b283e2ec..02367cf9e625 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
@@ -590,7 +590,7 @@ testcase tEditImageMap
     Aktiv.Click
     '/// Click on 'Macro...'-button
 	printlog " Click on 'Macro...'-button"
-	warnlog "Due to #i102720# this functionality is outcommented"
+	warnlog "#i102720# => crash, therefor this functionality is outcommented"
 '		Makro.Click
 '		Kontext "MakroZuweisen"
 '		Call DialogTest ( MakroZuweisen )
diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
index a05f22ed9360..4e6dbe0f8d70 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
@@ -48,7 +48,6 @@
 ' #0 tFileSaveAsDBF
 ' #1 tFileVersions
 ' #1 tFilePagePreview
-' #1 tFilePrint
 '*
 '\***********************************************************************
 
@@ -67,7 +66,7 @@ sub c_upd_filemenu
     Call tFileSaveAsDBF
     Call tFileVersions
     Call tFilePagePreview
-    Call tFilePrint
+    Call g_printing()
 
 end sub
 
@@ -596,71 +595,3 @@ testcase tFilePagePreview
 
 endcase
 
-'-----------------------------------------------------------
-
-testcase tFilePrint
-
-    '/// Open new Spreadsheet document
-    Printlog " Open new Spreadsheet document"
-    Call hNewDocument
-    '/// Enter some text
-    Printlog " Enter some text"
-    Kontext "DocumentCalc"
-    DocumentCalc.Typekeys "Test <RETURN>"
-    '/// Open File-Print
-    Printlog " Open File-Print"
-    FilePrint
-    '/// Look for warning regarding missing printer
-    '/// -> If configuration is missing only this MsgBox is tested
-    Kontext
-    if Active.Exists(2) then
-        if Active.GetRT = 304 then
-            Printlog Active.GetText
-            QAErrorLog "No printer is configured for this system"
-        else
-            Printlog Active.GetText
-            warnlog "There is an unexpected warning!"
-        end if
-        '/// Close messagebox with OK
-        Printlog " Close messagebox with OK"
-        Active.OK
-        '/// Cancel Print dialog
-        Printlog " Cancel Print dialog"
-        Kontext "DruckenDLG"
-        DruckenDLG.Cancel
-        '/// Close document
-        Printlog " Close document"
-        Call hCloseDocument
-        goto endsub
-    end if
-    Kontext "DruckenDLG"
-    '/// Check existence of print dilaog
-    Call DialogTest ( DruckenDLG )
-    '/// Invoke the print options dialog
-    Printlog " Invoke the print options dialog"
-    Kontext "DruckenDLG"
-    Zusaetze.Click
-    Kontext "TabPrintCalcOptions"
-    '/// Check existence of print options dilaog
-    Call DialogTest ( TabPrintCalcOptions )
-    '/// Cancel print options dialog
-    Printlog " Cancel print options dialog"
-    TabPrintCalcOptions.Cancel
-    '/// Check option 'Print to file'
-    Printlog " Check option 'Print to file'"         
-    Kontext "DruckenDLG"
-    AusdruckInDatei.check
-    '/// Commit print dialog
-    Printlog " Commit print dialog"
-    DruckenDLG.OK
-    '/// (Save file dialog should be visible now)
-    Kontext "SpeichernDLG"
-    '/// Check existence of save dilaog
-    Call DialogTest ( SpeichernDLG )
-    '/// Cancel save dialog
-    Printlog " Cancel save dialog"
-    SpeichernDLG.Cancel
-    '/// Close document
-    Printlog " Close document"
-    Call hCloseDocument
-endcase