CWS-TOOLING: integrate CWS os147

13 files changed, 141 insertions, 489 deletions

diff --git a/smoketestoo_native/data/Test_10er.xml b/smoketestoo_native/data/Test_10er.xml
index e39a39eae2aa..56a8d130fc13 100644
--- a/smoketestoo_native/data/Test_10er.xml
+++ b/smoketestoo_native/data/Test_10er.xml
@@ -39,7 +39,6 @@ const cTempFileName = "ttt"
 
 const cMessageSaveOpen8Doc = "Save/Open open Documents (8.0)"
 const cMessageSaveOpenXMLDoc = "Save/Open Document XML (6/7)"
-const cMessageSaveOpen50Doc = "Save/Open Document 5.0"
 const cMessageNewDoc = "New Document"
 const cMessageCloseDoc = "Close Document"
 
@@ -90,22 +89,6 @@ Sub DeleteAllSavedFiles()
     If FileExists (sFileName) then
         Kill (sFileName)
     End If
-    sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmWriter or cFlt50)
-    If FileExists (sFileName) then
-        Kill (sFileName)
-    End If
-    sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmCalc or cFlt50)
-    If FileExists (sFileName) then
-        Kill (sFileName)
-    End If
-    sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmImpress or cFlt50)
-    If FileExists (sFileName) then
-        Kill (sFileName)
-    End If
-    sFileName = sWorkPath+cTempFileName+"."+GetDocEndings(frmDraw or cFlt50)
-    If FileExists (sFileName) then
-        Kill (sFileName)
-    End If
 End Sub
 
 Sub DeleteAllLogFiles()
@@ -298,18 +281,12 @@ Sub WriteTests (sText as string, bTestAll as boolean, nFileChannel as integer)
     if bMakeSaveOpenXMLTest then
         sWriteStr = sWriteStr + ", save XML"
     end if
-    if bMakeSaveOpen50Test then
-        sWriteStr = sWriteStr + ", save 5.0"
-    end if
     if bMakeSaveOpen8Test then
         sWriteStr = sWriteStr + ", open 8.0"
     end if
     if bMakeSaveOpenXMLTest then
         sWriteStr = sWriteStr + ", open XML"
     end if
-    if bMakeSaveOpen50Test then
-        sWriteStr = sWriteStr + ", open 5.0"
-    end if
     end if
 
     sWriteStr = sWriteStr + ", close"
@@ -343,7 +320,7 @@ end Sub
 
 Sub MakeDocTest (FilterType as Integer)
     Dim oDoc as Object
-    Dim sFileNameXML$, sFileName50$, sFileName8$
+    Dim sFileNameXML$, sFileName8$
     Dim bError as Boolean
     Dim nCurrentAction as Integer
 
@@ -366,11 +343,6 @@ Sub MakeDocTest (FilterType as Integer)
             sFileNameXML = sWorkPathURL+cTempFileName+"."+GetDocEndings(FilterType or cFltXML)
             SaveDoc (sFileNameXML, oDoc, GetDocFilter(FilterType or cFltXML))
         end if
-        nCurrentAction = cDocSaveOpen50
-        if bMakeSaveOpen50Test and IsFilterAvailable (FilterType or cFlt50) then
-            sFileName50 = sWorkPathURL+cTempFileName+"."+GetDocEndings(FilterType or cFlt50)
-            SaveDoc (sFileName50, oDoc, GetDocFilter(FilterType or cFlt50))
-        end if
 '      oDoc.dispose
         nCurrentAction = cDocClose
         oDoc.close (true)
@@ -410,21 +382,6 @@ Sub MakeDocTest (FilterType as Integer)
             end If
         end if
 
-        nCurrentAction = cDocSaveOpen50
-        if bMakeSaveOpen50Test and IsFilterAvailable (FilterType or cFlt50) then
-            oDoc = LoadDoc (sFileName50)
-
-'          oDoc = Documents.open(sFileName)
-            LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpen50Doc, FileChannel)
-            LogState (not IsNull (oDoc),GetDocFilter(FilterType or cFltNewDoc)+" "+ cMessageSaveOpen50Doc, MainFileChannel)
-            SetStatus (FilterType, cDocSaveOpen50, not IsNull (oDoc))
-
-            if not IsNull (oDoc) then
-'              oDoc.dispose
-                nCurrentAction = cDocClose
-                oDoc.close (true)
-            end If
-        end if
     end If
     Print #FileChannel, "---"
     Close #FileChannel%
@@ -545,16 +502,8 @@ Function GetDocEndings (DocType as Integer) as String
             GetDocEndings = "odp" 'PrÕsentation
         case frmDraw or cFlt8
             GetDocEndings = "odg" 'Zeichen
-        case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML
+        case frmHyperText, frmHyperText or cFltXML
             GetDocEndings = "html" 'Hypertext-Dokument
-        case frmWriter or cFlt50
-            GetDocEndings = "sdw" ' Textdokument 5.0
-        case frmCalc or cFlt50
-            GetDocEndings = "sdc" 'Tabellendokument 5.0
-        case frmImpress or cFlt50
-            GetDocEndings = "sdd" 'PrÕsentation 5.0
-        case frmDraw or cFlt50
-            GetDocEndings = "sda" 'Zeichen 5.0
         case frmWriter or cFltXML
             GetDocEndings = "sxw" ' Textdokument
         case frmCalc or cFltXML
@@ -592,18 +541,8 @@ Function GetDocFilter (DocType as Integer) as String
         case frmMath or cFltXML
             GetDocFilter = "StarOffice XML (Math)" 'Formel
 
-        case frmHyperText, frmHyperText or cFlt50, frmHyperText or cFltXML
+        case frmHyperText, frmHyperText or cFltXML
             GetDocFilter = "HTML" 'Hypertext-Dokument
-        case frmWriter or cFlt50
-            GetDocFilter = "StarWriter 5.0" ' Textdokument 5.0
-        case frmCalc or cFlt50
-            GetDocFilter = "StarCalc 5.0" 'Tabellendokument 5.0
-        case frmImpress or cFlt50
-            GetDocFilter = "StarImpress 5.0" 'Präsentation 5.0
-        case frmDraw or cFlt50
-            GetDocFilter = "StarDraw 5.0" 'Zeichen 5.0
-        case frmMath or cFlt50
-            GetDocFilter = "StarMath 5.0" 'Formel 5.0
 
         case frmWriter or cFltNewDoc
             GetDocFilter = "swriter" ' Textdokument
@@ -667,8 +606,6 @@ Function GetErrorMessageOnAction (nAction as Integer) as String
             GetErrorMessageOnAction = cMessageSaveOpen8Doc
         case cDocSaveOpenXML
             GetErrorMessageOnAction = cMessageSaveOpenXMLDoc
-        case cDocSaveOpen50
-            GetErrorMessageOnAction = cMessageSaveOpen50Doc
         case cDocClose
             GetErrorMessageOnAction = cMessageCloseDoc
         case else
@@ -678,7 +615,7 @@ end Function
 
 Function IsFilterAvailable (FilterType as Integer) as boolean
     IsFilterAvailable = true
-    if ((FilterType = (frmHyperText or cFlt50)) or (FilterType = (frmHyperText or cFltXML))) then
+    if ((FilterType = (frmHyperText or cFltXML))) then
         IsFilterAvailable = false
     end if
 End Function
diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas
deleted file mode 100755
index d61c6183086a..000000000000
--- a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas
+++ /dev/null
@@ -1,67 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' 
-' Copyright 2000, 2010 Oracle and/or its affiliates.
-'
-' OpenOffice.org - a multi-platform office productivity suite
-'
-' This file is part of OpenOffice.org.
-'
-' OpenOffice.org is free software: you can redistribute it and/or modify
-' it under the terms of the GNU Lesser General Public License version 3
-' only, as published by the Free Software Foundation.
-'
-' OpenOffice.org is distributed in the hope that it will be useful,
-' but WITHOUT ANY WARRANTY; without even the implied warranty of
-' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-' GNU Lesser General Public License version 3 for more details
-' (a copy is included in the LICENSE file that accompanied this code).
-'
-' You should have received a copy of the GNU Lesser General Public License
-' version 3 along with OpenOffice.org.  If not, see
-' <http://www.openoffice.org/license.html>
-' for a copy of the LGPLv3 License.
-'
-'/************************************************************************
-'*
-'* owner : oliver.craemer@oracle.com
-'*
-'* short description : Load/Save test for chart files - Input: ODS, Output: SDC
-'*
-'\************************************************************************
-
-Global gsFileFormat as String
-Global gsDirectoryInSourcePath as String
-Global gsOutputFileCustomExtension as String
-
-sub main          
-    gsFileFormat = "StarCalc 5.0"        
-    'Important for determination of input file source path
-    '-> gtesttoolpath & "chart2\optional\input\" & gsDirectoryInSourcePath &"\"
-    gsDirectoryInSourcePath = "ods"
-    
-    'Custom output file extension. Can be different to result from hGetFilternameExtension.
-    'e.g. "_excel95.xls"
-    gsOutputFileCustomExtension = ".sdc"
-        
-    Printlog "--------------------------------------------------"
-    Printlog "---       Load charts in ODS - SaveAS SDC      ---"
-    Printlog "--------------------------------------------------"
-
-    use "chart2/optional/includes/loadsave/ch2_losa.inc"
-    use "chart2/tools/ch_tools_common.inc"
-    
-    Call hStatusIn("Chart2", "ch2_losa_ods_to_sdc.bas")       
-        call subLoSaFromTo   
-    Call hStatusOut                                 
-end sub
-'
-'-------------------------------------------------------------------------
-'
-sub LoadIncludeFiles
-    use "global\system\includes\master.inc"
-    use "global\system\includes\gvariabl.inc"
-    gApplication   = "CALC"
-    Call GetUseFiles
-end sub
diff --git a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas
deleted file mode 100755
index 7c8e8726f580..000000000000
--- a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas
+++ /dev/null
@@ -1,68 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' 
-' Copyright 2000, 2010 Oracle and/or its affiliates.
-'
-' OpenOffice.org - a multi-platform office productivity suite
-'
-' This file is part of OpenOffice.org.
-'
-' OpenOffice.org is free software: you can redistribute it and/or modify
-' it under the terms of the GNU Lesser General Public License version 3
-' only, as published by the Free Software Foundation.
-'
-' OpenOffice.org is distributed in the hope that it will be useful,
-' but WITHOUT ANY WARRANTY; without even the implied warranty of
-' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-' GNU Lesser General Public License version 3 for more details
-' (a copy is included in the LICENSE file that accompanied this code).
-'
-' You should have received a copy of the GNU Lesser General Public License
-' version 3 along with OpenOffice.org.  If not, see
-' <http://www.openoffice.org/license.html>
-' for a copy of the LGPLv3 License.
-'
-'/************************************************************************
-'*
-'* owner : oliver.craemer@oracle.com
-'*
-'* short description : Load/Save test for chart files - Input: SXC, Output: SDC
-'*
-'\************************************************************************
-
-Global gsFileFormat as String
-Global gsDirectoryInSourcePath as String
-Global gsOutputFileCustomExtension as String
-
-sub main      
-    gsFileFormat = "StarCalc 5.0"
-        
-    'Important for determination of input file source path
-    '-> gtesttoolpath & "chart2\optional\input\" & gsDirectoryInSourcePath &"\"
-    gsDirectoryInSourcePath = "sxc"
-    
-    'Custom output file extension. Can be different to result from hGetFilternameExtension.
-    'e.g. "_excel95.xls"
-    gsOutputFileCustomExtension = ".sdc"
-    
-    Printlog "--------------------------------------------------"
-    Printlog "---       Load charts in SXC - SaveAS SDC      ---"
-    Printlog "--------------------------------------------------"
-
-    use "chart2/optional/includes/loadsave/ch2_losa.inc"
-    use "chart2/tools/ch_tools_common.inc"
-    
-    Call hStatusIn("Chart2", "ch2_losa_sxc_to_sdc.bas")       
-        Call subLoSaFromTo   
-    Call hStatusOut                                 
-end sub
-'
-'-------------------------------------------------------------------------
-'
-sub LoadIncludeFiles
-    use "global\system\includes\master.inc"
-    use "global\system\includes\gvariabl.inc"
-    gApplication   = "CALC"
-    Call GetUseFiles
-end sub
diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas
index 02cc2c883269..e04d0ab2a70c 100755..100644
--- a/testautomation/chart2/required/ch2_updt_calc.bas
+++ b/testautomation/chart2/required/ch2_updt_calc.bas
@@ -71,8 +71,6 @@ sub main
     call tFileSaveAsSTC
     call tFileSaveAsXLS
     call tFileSaveAsXLT
-    call tFileSaveAsSDC
-    call tFileSaveAsVOR
     call tFileReload                
     printLog Chr(13) + "----------  Chart2 View Menu -----------"
     Call tViewToolbars
diff --git a/testautomation/chart2/required/includes/ch2_file.inc b/testautomation/chart2/required/includes/ch2_file.inc
index f7166df9c82e..51e41398532e 100755..100644
--- a/testautomation/chart2/required/includes/ch2_file.inc
+++ b/testautomation/chart2/required/includes/ch2_file.inc
@@ -37,8 +37,6 @@
 ' #1 tFileSaveAsSTC
 ' #1 tFileSaveAsXLS
 ' #1 tFileSaveAsXLT
-' #1 tFileSaveAsSDC
-' #1 tFileSaveAsVOR
 ' #1 tFileReload
 '*
 '\************************************************************************
@@ -295,82 +293,7 @@ testcase tFileSaveAsXLT
 endcase
 '
 '-------------------------------------------------------------
-'
-testcase tFileSaveAsSDC
-'///<u><b>Save the test file as StarCalc 5.0 (.sdc)</b></u> 
-    Dim sOutputFile as string
-   
-    sOutputFile = convertpath( gOfficepath & "user/work/verySimpleChart.sdc" )
 
-    '/// Load simple chart document 
-    if fLoadVerySimpleChartAndSaveLocal() > 0 then
-        warnlog "Loading test document seems to have failed -> Check this out!"
-        goto endsub
-    endif
-    '/// Select chart using navigator 
-    call fSelectFirstOLE
-    '/// Invoke Edit::Object::Edit to enter Inplace Mode 
-    EditObjectEdit
-    '/// Convert chart to 3D (just to edit document) 
-    if NOT fConvertChartTo3D() then
-        warnlog "Conversion of chart to 3D failed -> Quit testcase"
-        Call hCloseDocument
-        goto endsub
-    endif
-    '/// Unselect chart using Escape key 
-    Kontext "DocumentCalc"
-    DocumentCalc.TypeKeys "<Escape>"
-    '/// Save document as StarCalc 5.0 (.sdc) 
-    if NOT hFileSaveAsWithFilterKill ( sOutputFile , "StarCalc 5.0" ) then
-        warnlog "Saving test document as '" & sOutputFile & "' failed -> Aborting"
-        call hCloseDocument
-        goto endsub
-    endif
-    '/// Close document 
-    Kontext "DocumentCalc"
-    DocumentCalc.TypeKeys "<Escape>"
-    Call hCloseDocument
-endcase
-'
-'-------------------------------------------------------------
-'
-testcase tFileSaveAsVOR
-'///<u><b>Save the test file as StarCalc 5.0 Template(.vor)</b></u> 
-    Dim sOutputFile as string
-           
-    sOutputFile = convertpath( gOfficepath & "user/work/verySimpleChart.vor" )
-
-    '/// Load simple chart document 
-    if fLoadVerySimpleChartAndSaveLocal() > 0 then
-        warnlog "Loading test document seems to have failed -> Check this out!"
-        goto endsub
-    endif
-    '/// Select chart using navigator 
-    call fSelectFirstOLE
-    '/// Invoke Edit::Object::Edit to enter Inplace Mode 
-    EditObjectEdit
-    '/// Convert chart to 3D (just to edit document) 
-    if NOT fConvertChartTo3D() then
-        warnlog "Conversion of chart to 3D failed -> Quit testcase"
-        Call hCloseDocument
-        goto endsub
-    endif
-    '/// Unselect chart using Escape key 
-    Kontext "DocumentCalc"
-    DocumentCalc.TypeKeys "<Escape>"
-    '/// Save document as StarCalc 5.0 Template(.vor) 
-    if NOT hFileSaveAsWithFilterKill ( sOutputFile , "StarCalc 5.0 Vorlage/Template" ) then
-        warnlog "Saving test document as '" & sOutputFile & "' failed -> Aborting"
-        call hCloseDocument
-        goto endsub
-    endif
-    '/// Close document 
-    Kontext "DocumentCalc"
-    DocumentCalc.TypeKeys "<Escape>"
-    Call hCloseDocument
-endcase
-'
-'-------------------------------------------------------------
 '
 testcase tFileReload
     printlog "Load simple chart document" 
diff --git a/testautomation/framework/required/includes/smoketest.inc b/testautomation/framework/required/includes/smoketest.inc
index d4e327a21ad7..9fae007b891d 100644
--- a/testautomation/framework/required/includes/smoketest.inc
+++ b/testautomation/framework/required/includes/smoketest.inc
@@ -131,7 +131,7 @@ testcase tSmokeTest
                 ' If macro fails for whatever reason, a message comes up
                 Kontext
                 if active.exists() then
-                    warnlog "#i87290# " + active.getText
+                    warnlog "Macro failed " + active.getText
                     active.ok
                     call hCloseDocument()
                     goto endsub
diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc
index fdfdb49fec97..24ed020d4c77 100644
--- a/testautomation/framework/required/includes/topten.inc
+++ b/testautomation/framework/required/includes/topten.inc
@@ -65,7 +65,6 @@ testcase Top_ten_test
 
     dim sUserWorkDirectory as string
     dim sFilename_native as String
-    dim sFilename_export as String
     dim sFilter_native as string
     dim sFilter_export as String
     dim bExportFile as boolean
@@ -78,19 +77,15 @@ testcase Top_ten_test
     ' set the filenames and their filters. HTML is not exported
     if ( gApplication = "HTML" ) then
         sFilename_native = "ls_test.html"
-        sFilename_export = "ls_test.htm"  
         bExportFile      = FALSE      
     else
         sFilename_native = "ls_test" & hGetSuffix( "current" )
-        sFilename_export = "ls_test" & hGetSuffix( "569" )
     endif
     
     printlog( "File (current): " & sFilename_native )
-    printlog( "File (src569).: " & sFilename_export )
     
     ' Delete the workfiles, they might have been left over by prior incomplete testrun
     hDeleteFile( sUserWorkDirectory & sFilename_native )
-    hDeleteFile( sUserWorkDirectory & sFilename_export )
     
     ' Set the API filternames for the current application (native XML format)
     select case gApplication
@@ -113,45 +108,16 @@ testcase Top_ten_test
     printlog( "Save (default-fileformat): " & sFilename_native )
     call hFileSaveAsKill ( sUserWorkDirectory & sFilename_native )
     
-    if ( bExportFile ) then
-    
-        ' Set the API filternames for the current application (StarOffice 5.2 binary format)
-        select case gApplication
-        case "WRITER"          : sFilter_export = "StarWriter 5.0"
-        case "CALC"            : sFilter_export = "StarCalc 5.0"
-        case "DRAW"            : sFilter_export = "StarDraw 5.0"
-        case "IMPRESS"         : sFilter_export = "StarImpress 5.0"
-        case "MATH"            : sFilter_export = "StarMath 5.0"
-        case "MASTERDOCUMENT"  : sFilter_export = "StarWriter 5.0/GlobalDocument"
-        case else              : warnlog "Invalid gApplication: " & gApplication 
-        end select
-        
-        printlog( "Save (5.2-fileformat): " & sFilename_export )
-        hFileSaveAsWithFilterKill( sUserWorkDirectory & sFilename_export , sFilter_export )
-
-        printlog( "Close" )
-        FileClose
-
-        ' There should be no alien warning
-        kontext "active"
-        If ( active.exists( 1 ) ) then
-            warnlog( "Unexpected messagebox: '" & active.getText & "'" )
-            Active.Yes
-        else
-            printlog( "No more alien warning on closing the document. Good." )
-        endif
-    else
-        FileClose
+    FileClose
 
-        kontext "active"
-        if ( Active.Exists( 1 ) ) then
-            warnlog( "Unexpected Active after saving: '" & active.getText & "'" )
-            try
-                Active.Yes()
-            catch
-                Active.No()
-            endcatch
-        endif
+    kontext "active"
+    if ( Active.Exists( 1 ) ) then
+        warnlog( "Unexpected Active after saving: '" & active.getText & "'" )
+        try
+            Active.Yes()
+        catch
+            Active.No()
+        endcatch
     endif
 
     printlog( "Load (default-fileformat): " & sFilename_native )
@@ -167,60 +133,7 @@ testcase Top_ten_test
     printlog( "Close" )
     FileClose
 
-    if ( bExportFile ) then
-    
-        printlog( "Load (5.2-fileformat): " & sFilename_export )
-        call hFileOpen (sUserWorkDirectory & sFilename_export)
-        
-        if ( gApplication = "MATH" AND iSprache = 84 AND gPlatform="lin" ) then
-            try
-                kontext "DocumentMath"
-                DocumentMath.MouseDown(50,50)
-                DocumentMath.MouseUp(50,50)
-                qaErrorLog( "Use workaround focus problem for math and language vi/84" )
-                ' Needed by AndreSchnabel, not manual reproduceable, only with TestTool
-            catch
-                qaErrorLog( "Workaround focus problem failed." )
-            endcatch
-        endif
-        
-        ' Modify the export document to trigger the alien warning on next save
-        printlog( "Change the document" )
-        hChangeDoc()
-        
-        printlog( "Save" )
-        FileSave
-
-        Kontext "AlienWarning"
-        if ( AlienWarning.exists( 3 ) ) then
-            printlog( "Closing expected alien warning. Good." )
-            AlienWarning.OK()
-        else
-            warnlog( "Alien warning is missing" )
-        endif
-
-        kontext "active"
-        if ( Active.Exists( 3 ) ) then
-            warnlog(  "Unexpected messagebox: '" & active.getText & "'" )
-            Active.yes
-        else
-            printlog( "No unexpected messages on save. Good." )
-        endif
-
-        printlog( "Close" )
-        FileClose
-
-        kontext "active"
-        if ( Active.Exists() ) then
-            warnlog( "Unexpected messagebox: '" & active.getText & "'" )
-            Active.Yes()
-        else
-            printlog( "No more alien warning to close. Good." )
-        endif
-    endif
-    
     hDeleteFile( sUserWorkDirectory & sFilename_native )
-    hDeleteFile( sUserWorkDirectory & sFilename_export )
     
 endcase
 
diff --git a/testautomation/framework/required/input/10erTest_680.sxw b/testautomation/framework/required/input/10erTest_680.sxw
index afae9513c6fe..b07bfc2e36bb 100755
--- a/testautomation/framework/required/input/10erTest_680.sxw
+++ b/testautomation/framework/required/input/10erTest_680.sxw
diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc
index d43c49610c26..d3ff4cdcfea5 100644
--- a/testautomation/graphics/optional/includes/global/g_clipboard.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc
@@ -30,15 +30,6 @@
 '* short description :
 '*
 '**************************************************************************************
-' #1 tiEditUndo
-' #1 tiEditRedo
-' #1 tiEditClipboard
-' #1 tiEditPasteSpecial_HTML
-' #1 tdEditPasteSpecial_Text
-' #1 tdEditPasteSpecial_Graphic
-' #1 tdEditPasteSpecial_Circle
-' #1 tiEditPasteSpecial
-'\*************************************************************************************
 
 testcase tiEditUndo
 
@@ -128,6 +119,7 @@ testcase tiEditUndo
     end if
     TabPositionAndSize.Cancel
     printlog "Close document"
+     Call hCloseDocument	
     sLocaltestfile = hFileGetLocalPath( gTesttoolPath + "leer."+ExtensionString )
     printlog sLocaltestfile
     if (FileExists (sLocaltestfile)) then
@@ -137,8 +129,7 @@ testcase tiEditUndo
         warnlog "File is missing."
     endif
 
-    printlog "Close document"
-    Call hCloseDocument						
+    printlog "Close document"					
 
 endcase 'tiEditUndo
 
diff --git a/testautomation/graphics/required/includes/global/id_001.inc b/testautomation/graphics/required/includes/global/id_001.inc
index fee150c8381a..b878278961b1 100644
--- a/testautomation/graphics/required/includes/global/id_001.inc
+++ b/testautomation/graphics/required/includes/global/id_001.inc
@@ -105,68 +105,122 @@ testcase tiFileSaveAs
     printlog "load a sample presentation file"
     Call hFileOpen ( ConvertPath(gTesttoolPath + sFileName) )
     WaitSlot (3000)
-    
-    printlog "running 5 times save as with different Filters"
-    for i = 1 to 6
-        printlog "calling Save as Dialog"
-        FileSaveAs
-        WaitSlot (2000)
-        Kontext "SpeichernDlg"
-        printlog "Selecting filter according to number of run"
-        Dateityp.Select i
-        sFilterName = Dateityp.GetSelText
-        sFileName = sPath + sFile + (i)
-        printlog "Filename is " & sFileName
-        printlog "Filtername for this file is " & sFilterName
-        Dateiname.SetText (sFileName)
-        Speichern.Click
-        kontext "AlienWarning"
-        if AlienWarning.exists(5) then
-            AlienWarning.OK
+
+    printlog "Select between Impress and Draw:"
+
+    if (gApplication = "DRAW") then
+        printlog "CASE DRAW: running 4 times save as with different Filters"
+        for i = 1 to 4
+            printlog "calling Save as Dialog, " & i
+            FileSaveAs
+            WaitSlot (2000)
+            Kontext "SpeichernDlg"
+            printlog "Selecting filter according to number of run"
+            Dateityp.Select i
+            sFilterName = Dateityp.GetSelText
+            sFileName = sPath + sFile + (i)
+            printlog "Filename is " & sFileName
+            printlog "Filtername for this file is " & sFilterName
+            Dateiname.SetText (sFileName)
+            Speichern.Click
+            kontext "AlienWarning"
+            if AlienWarning.exists(5) then
+                AlienWarning.OK
+            end if
+            WaitSlot (5000)
+        next i
+        printlog "closing the sample file"
+        fileclose
+        WaitSlot (3000)
+        kontext "Messagebox"
+        if Messagebox.exists then
+            printlog "Messagebox about informationloss... :-) that's OK: 'Text in the messagebox: "+Messagebox.GetText+"'"
+            Messagebox.YES
         end if
-        WaitSlot (5000)
-    next i
-    printlog "closing the sample file"
-    fileclose
-    WaitSlot (3000)
-    kontext "Messagebox"
-    if Messagebox.exists then
-        printlog "Messagebox about informationloss... :-) that's OK: 'Text in the messagebox: "+Messagebox.GetText+"'"
-        Messagebox.YES
-    end if
-     
-    printlog "Loading the former saved files:"
-    for i = 1 to 6 'run it 5 times
-    
-        FileOpen
-        Kontext "OeffnenDlg"
-        WaitSlot (2000)
-        DateiAuswahl.TypeKeys "<END>"
-        DateiAuswahl.TypeKeys "<HOME>"
-        if i <> 1 then
-            DateiAuswahl.TypeKeys "<DOWN>", (i-1)
-        endif
-        sFileNameLoaded = Dateiname.GetSelText
-        printlog "File will be loaded: " & sFileNameLoaded
-        Oeffnen.Click
-        printlog "Closing doc if it gets loaded: " & sFileNameLoaded
-        if gApplication = "IMPRESS" then 
-            Kontext "DocumentImpress"
-            if DocumentImpress.exists(5) then
-                Call hCloseDocument
-            else
-                warnlog "File did not get loaded."
+
+        printlog "Loading the former saved files:"
+        for i = 1 to 4 'run it 4 times
+
+            FileOpen
+            Kontext "OeffnenDlg"
+            WaitSlot (2000)
+            DateiAuswahl.TypeKeys "<END>"
+            DateiAuswahl.TypeKeys "<HOME>"
+            if i <> 1 then
+                DateiAuswahl.TypeKeys "<DOWN>", (i-1)
             endif
-        else
+            sFileNameLoaded = Dateiname.GetSelText
+            printlog i & ":File will be loaded: " & sFileNameLoaded
+            Oeffnen.Click
+            printlog "Closing doc if it gets loaded: " & sFileNameLoaded
             Kontext "DocumentDraw"
             if DocumentDraw.exists(5) then
                 Call hCloseDocument
             else
                 warnlog "File did not get loaded."
             endif
-        endif
-        WaitSlot (2000)
-    next i
+            WaitSlot (2000)
+        next i
+    else
+        printlog "CASE IMPRESS: running 9 times save as with different Filters"
+        for i = 1 to 9
+            printlog "calling Save as Dialog, " & i
+            FileSaveAs
+            WaitSlot (2000)
+            Kontext "SpeichernDlg"
+            printlog "Selecting filter according to number of run"
+            Dateityp.Select i
+            sFilterName = Dateityp.GetSelText
+            sFileName = sPath + sFile + (i)
+            printlog "Filename is " & sFileName
+            printlog "Filtername for this file is " & sFilterName
+            Dateiname.SetText (sFileName)
+            Speichern.Click
+            kontext "AlienWarning"
+            if AlienWarning.exists(5) then
+                AlienWarning.OK
+            end if
+            WaitSlot (5000)
+        next i
+        printlog "closing the sample file"
+        fileclose
+        WaitSlot (3000)
+        kontext "Messagebox"
+        if Messagebox.exists then
+            printlog "Messagebox about informationloss... :-) that's OK: 'Text in the messagebox: "+Messagebox.GetText+"'"
+            Messagebox.YES
+        end if
+
+        printlog "Loading the former saved files:"
+        for i = 1 to 9 'run it 9 times
+            FileOpen
+            Kontext "OeffnenDlg"
+            WaitSlot (2000)
+            DateiAuswahl.TypeKeys "<END>"
+            DateiAuswahl.TypeKeys "<HOME>"
+            if i <> 1 then
+                DateiAuswahl.TypeKeys "<DOWN>", (i-1)
+            endif
+            sFileNameLoaded = Dateiname.GetSelText
+            printlog i & ":File will be loaded: " & sFileNameLoaded
+            Oeffnen.Click
+            printlog "Closing doc if it gets loaded: " & sFileNameLoaded
+            printlog "For checking if its open and closing the doc we need to differ Impress and Draw:"
+            Kontext "DocumentImpress"
+            if DocumentImpress.exists(5) then
+                Call hCloseDocument
+            else
+                Kontext "DocumentDraw"
+                if DocumentDraw.exists(5) then
+                    Call hCloseDocument
+                else
+                    warnlog "File did not get loaded."
+                endif
+            endif
+
+            WaitSlot (2000)
+        next i
+    endif
 
 endcase 'tiFileSaveAs
 
diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc
index 58582452dc63..c36bb8822808 100644
--- a/testautomation/math/optional/includes/m_101_.inc
+++ b/testautomation/math/optional/includes/m_101_.inc
@@ -243,7 +243,7 @@ endcase
 testcase tFilePassword
    dim i,x as integer
    dim sTemp as string
-   const cFilterCount = 4
+   const cFilterCount = 3
    dim sFilterName as string
    dim sFilter as string
    dim sFilterExt() as string
@@ -269,7 +269,6 @@ testcase tFilePassword
    if x <> cFilterCount then warnlog " The Filter count is wrong! Have to be ("+cFilterCount+"), but are: "+x
 '   Check: (1): Open Office Formula (.oof)
 '   Check: (2): MathML 1.01 (.mml)
-'   Check: (5): StarMath 5.0 (.smf)
 '   Check: (6): StarOffice 6.0/7 Formula (.sxm)
 
 '/// check if any other then gMathFilter is password able; and if gMathFilter is password able ///'
diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
index f8dd252cd174..33768d6ffc38 100644
--- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
+++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
@@ -217,7 +217,7 @@ testcase tExportAllReadableFormatsIntoThemselves
     end if
     app.Mkdir sWorkDirectory
 
-    For iCurrentFileIndex = 7 to 7
+    For iCurrentFileIndex = 1 to 7
         select case iCurrentFileIndex
         case 1 :   sCurrentFile = "xml2.odt"
             sCurrentFilter = "writer8"
@@ -225,49 +225,18 @@ testcase tExportAllReadableFormatsIntoThemselves
             sCurrentFilter = "Text (encoded)"
         case 3 :   sCurrentFile = "dostext.txt"
             sCurrentFilter = "Text (encoded)"
-        case 4 :   sCurrentFile = "sw30.sdw"
-            sCurrentFilter = "StarWriter 3.0"
-        case 5 :   sCurrentFile = "sw50.vor"
-            sCurrentFilter = "StarWriter 5.0 Vorlage/Template"
-        case 6 :   sCurrentFile = "sw31.sdw"
-            sCurrentFilter = "StarWriter 3.0"
-        case 7 :   sCurrentFile = "sw31.vor"
-            sCurrentFilter = "StarWriter 3.0 Vorlage/Template"
-        case 8 :   sCurrentFile = "sw40.sdw"
-            sCurrentFilter = "StarWriter 4.0"
-        case 9 :   sCurrentFile = "sw40_sp2.vor"
-            sCurrentFilter = "StarWriter 4.0 Vorlage/Template"
-        case 10 :  sCurrentFile = "sw50.sdw"
-            sCurrentFilter = "StarWriter 5.0"
-        case 11 :  sCurrentFile = "html.html"
+        case 4 :  sCurrentFile = "html.html"
             sCurrentFilter = "HTML (StarWriter)"
-        case 12 :  sCurrentFile = "rtf.rtf"
+        case 5 :  sCurrentFile = "rtf.rtf"
             sCurrentFilter = "Rich Text Format"
-        case 13 :  sCurrentFile = "sw60.sxw"
+        case 6 :  sCurrentFile = "sw60.sxw"
             sCurrentFilter = "StarOffice XML (Writer)"
-        case 14 :  sCurrentFile = "winw97.doc"
+        case 7 :  sCurrentFile = "winw97.doc"
             sCurrentFilter = "MS Word 97"
-        case 15 :  sCurrentFile = "winword6.doc"
+        case 8 :  sCurrentFile = "winword6.doc"
             sCurrentFilter = "MS Word 95"
-        case 16 :  sCurrentFile = "wintext.txt"
+        case 9 :  sCurrentFile = "wintext.txt"
             sCurrentFilter = "Text (encoded)"
-            '               case 17 : sCurrentFile = "pocketword.psw"
-            '                         sCurrentFilter = "PocketWord File"
-            '				TODO: 18-23 not applyable. Can be opened, but saving in the format is not supported.
-            '               case 18 : sCurrentFile = "unixtext.txt"
-            '                         sCurrentFilter = "Text"
-            '               case 19 : sCurrentFile = "sw2.sdw"
-            '                         sCurrentFilter = "StarWriter 2.0"
-            '               case 20 : sCurrentFile = "amipro3.sam"
-            '                         sCurrentFilter = "Ami Pro 1.x-3.1 (W4W)"
-            '               case 21 : sCurrentFile = "mactext.txt"
-            '                         sCurrentFilter = "Mac Write 4.x 5.0 (W4W)"
-            '               case 22 : sCurrentFile = "sw1.sdw"
-            '                         sCurrentFilter = "StarWriter 1.0"
-            '               case 23 : sCurrentFile = "swdoc.txt"
-            '                         sCurrentFilter = "Text (encoded) (StarWriter/GlobalDocument)"
-            '               case 24 : sCurrentFile = "hangul.hwp"
-            '                         sCurrentFilter = "writer_MIZI_Hwp_97"
         end select
 
         sLoadFile = sImportDir & sCurrentFile
diff --git a/testautomation/writer/optional/includes/number/w_207_.inc b/testautomation/writer/optional/includes/number/w_207_.inc
index 4bc525553f56..972f2303d565 100644
--- a/testautomation/writer/optional/includes/number/w_207_.inc
+++ b/testautomation/writer/optional/includes/number/w_207_.inc
@@ -106,12 +106,15 @@ testcase tToolsNumbering12
 				                 "." & sCurrentFilterExt )
 				hDeleteFile( ExportFileName ) ' There should never be a reason to overwrite 
 
-				printlog "  - export as: " & ExportFileName
-				Call hFileSaveAsWithFilter( ExportFileName, sCurrentFilter )
-				Call hCloseDocument
-
-				printlog "  - load previous saved document"
-				hFileOpen(  ExportFileName )
+                ' Binary export filter was removed
+                if iDocumentType < 3 then
+                    printlog "  - export as: " & ExportFileName
+                    Call hFileSaveAsWithFilter( ExportFileName, sCurrentFilter )
+                    Call hCloseDocument
+
+                    printlog "  - load previous saved document"
+                    hFileOpen(  ExportFileName )
+                endif
 
 				printlog "  - close document"
 				hFileCloseAll()