CWS-TOOLING: integrate CWS ka102

5 files changed, 117 insertions, 78 deletions

diff --git a/testautomation/graphics/optional/d_export_graphic_a.bas b/testautomation/graphics/optional/d_export_graphic_a.bas
index 45b5ef107409..ebe35387d000 100755
--- a/testautomation/graphics/optional/d_export_graphic_a.bas
+++ b/testautomation/graphics/optional/d_export_graphic_a.bas
@@ -61,6 +61,7 @@ sub main
     Call tXPM   'X PixMap
     Call tGIF   'Graphics Interchange Format     
     Call tJPEG  'Joint Photographic Experts Group
+    Call tSVG   'Scalable Vector Graphics
 
     Call hStatusOut
 end sub
diff --git a/testautomation/graphics/optional/export_graphic_a.bas b/testautomation/graphics/optional/export_graphic_a.bas
index 1bd3149cf650..b7bb9ad8819c 100755
--- a/testautomation/graphics/optional/export_graphic_a.bas
+++ b/testautomation/graphics/optional/export_graphic_a.bas
@@ -60,6 +60,7 @@ sub main
     Call tXPM   'X PixMap                       
     Call tGIF   'Graphics Interchange Format    
     Call tJPEG  'Joint Photographic Experts Group
+    Call tSVG   'Scalable Vector Graphics
 
     Call hStatusOut
 end sub
diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc
index a5ab31c82cdc..ce25c3925bd7 100644
--- a/testautomation/graphics/optional/includes/global/export_graphic.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic.inc
@@ -330,6 +330,31 @@ testcase tTIFF
 
 endcase 'tTIFF
 '------------------------------------------------------------------------------
+testcase tSVG
+    'warnlog( "#i115138# - Test document freezes draw" )
+    'goto endsub
+
+    dim x as integer
+    dim i as integer
+
+    const sFilter = "SVG - Scalable Vector Graphics (.svg)"
+    const sExt = ".svg"
+
+    printlog "Open the document"
+    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString ))
+
+    printlog "Save it"
+    if ( hCallExport (OutputGrafikTBO , sFilter ) ) then
+        printlog( "Close file and re-insert graphics into new document" )
+        hInsertGraphicsToNewFile( OutputGrafikTBO + sExt ) ' local helper function, see bottom of this file
+    else
+        warnlog( "No export options dialog was displayed" )
+    endif
+
+    call hCloseDocument
+
+endcase 'tSVG
+'------------------------------------------------------------------------------
 testcase tXPM
     warnlog( "#i115138# - Test document freezes draw" )
     goto endsub
diff --git a/testautomation/graphics/optional/includes/global/g_load_save.inc b/testautomation/graphics/optional/includes/global/g_load_save.inc
index d0d51e8337c7..7e9f9e8320fc 100644
--- a/testautomation/graphics/optional/includes/global/g_load_save.inc
+++ b/testautomation/graphics/optional/includes/global/g_load_save.inc
@@ -488,6 +488,8 @@ endcase 'tDeletedTemplate
 '-------------------------------------------------------------------------------
 
 testcase tSaveLoadLayoutEmpty
+warnlog "#i110054# Empty OOo saved as UOF file comes up read only"
+goto endsub
     Dim NewFileDir as String
 
     NewFileDir = ConvertPath (gOfficePath + "user\work\LayoutTest\")
diff --git a/testautomation/graphics/optional/includes/global/g_savepictureas.inc b/testautomation/graphics/optional/includes/global/g_savepictureas.inc
index bbf9776b7ece..e340308dce0a 100644
--- a/testautomation/graphics/optional/includes/global/g_savepictureas.inc
+++ b/testautomation/graphics/optional/includes/global/g_savepictureas.inc
@@ -173,88 +173,88 @@ testcase tContextSaveAsPicture
             Testsize = false
             SavedOrgPosition = Dateityp.GetSelIndex
             select case left(lcase(Dateityp.GetSelText),3) 'Filetype
-            case "png" : if (Filetype = "png") OR (Filetype = "psd") OR (Filetype = "pcx") OR (Filetype = "xbm") OR (Filetype = "ras") OR (Filetype = "pbm") OR (Filetype = "pcd") OR (Filetype = "pgm") OR (Filetype = "bmp") OR (Filetype = "ppm") OR (Filetype = "sgf") OR (Filetype = "xpm") OR (Filetype = "tga") then
-                printlog "   " + Filetype + " will be saved as png, correct."
-                CounterShouldBe = 17
-            else
-                warnlog "Png should not have been selected when we opened a '" + Filetype + "'-file."
-            endif
-        case "svm" : if (Filetype = "svm") OR (Filetype = "dxf") OR (Filetype = "eps") OR (Filetype = "sgv") then
-            printlog "   " + Filetype + " will be saved as Svm, correct."
-            CounterShouldBe = 17
-        else
-            warnlog "Svm should not have been selected when we opened a '" + Filetype + "'-file."
-        endif
-    case "wmf" : if (Filetype = "wmf") OR (Filetype = "emf") then
-        printlog "   " + Filetype + " will be saved as Wmf, correct."
-        CounterShouldBe = 17
-        if Filetype = "wmf" then Testsize = true
-        else
-            warnlog "Wmf should not have been selected when we opened a '" + Filetype + "'-file."
-        endif
-    case "jpe" : if (Filetype = "jpg") OR Filetype = "jif" OR Filetype = "peg" then
-        printlog "   " + Filetype + " will be saved as Jpg, correct."
-        CounterShouldBe = 17
-        if Filetype = "jpg" then Testsize = true
-        else
-            warnlog "Jpg should not have been selected when we opened a '" + Filetype + "'-file."
-        endif
-    case "tif" : if Filetype = "tif" OR Filetype = "iff" then
-        printlog "   " + Filetype + " will be saved as Tiff, correct."
-        CounterShouldBe = 17
-        if Filetype = "tif" then Testsize = true
-        else
-            warnlog "Tif should not have been selected when we opened a '" + Filetype + "'-file."
-        endif
-    case "sgf" : if (Filetype = "sgv") OR (Filetype = "sgf") then
-        printlog "   " + Filetype + " will be saved as Sgf, correct."
-        CounterShouldBe = 17
-        if Filetype = "sgf" then Testsize = true
-        else
-            warnlog "Sgf should not have been selected when we opened a '" + Filetype + "'-file."
-        endif
-    case "gif" : if (Filetype = "gif") then
-        printlog "   " + Filetype + " will be saved as Gif, correct."
-        CounterShouldBe = 17
-        if Filetype = "gif" then Testsize = true
-        else
-            warnlog "Gif should not have been selected when we opened a '" + Filetype + "'-file."
-        endif
-    case "met" : if (Filetype = "met") then
-        printlog "   " + Filetype + " will be saved as Met, correct."
-        CounterShouldBe = 17
-        if Filetype = "met" then Testsize = true
-        else
-            warnlog "Met should not have been selected when we opened a '" + Filetype + "'-file."
-        endif
-    case "pct" : if (Filetype = "pct") OR (Filetype = "ict") then
-        printlog "   " + Filetype + " will be saved as Pct, correct."
-        CounterShouldBe = 17
-        if Filetype = "pct" then Testsize = true
-        else
-            warnlog "Pct should not have been selected when we opened a '" + Filetype + "'-file."
-        endif
-    case else  : qaerrorlog "   The test has not yet been fitted for this format ( " + Filetype + "). Contact FHA."
-        printlog "   But will be saved as: " + left(lcase(Dateityp.GetSelText),3)
-        CounterShouldBe = 18
-        Testsize = true
-    end select
+                case "png" : if (Filetype = "png") OR (Filetype = "psd") OR (Filetype = "pcx") OR (Filetype = "xbm") OR (Filetype = "ras") OR (Filetype = "pbm") OR (Filetype = "pcd") OR (Filetype = "pgm") OR (Filetype = "bmp") OR (Filetype = "ppm") OR (Filetype = "sgf") OR (Filetype = "xpm") OR (Filetype = "tga") then
+                    printlog "   " + Filetype + " will be saved as png, correct."
+                    CounterShouldBe = 17
+                else
+                    warnlog "Png should not have been selected when we opened a '" + Filetype + "'-file."
+                endif
+                case "svm" : if (Filetype = "svm") OR (Filetype = "svg") OR (Filetype = "dxf") OR (Filetype = "eps") OR (Filetype = "sgv") then
+                    printlog "   " + Filetype + " will be saved as Svm, correct."
+                    CounterShouldBe = 17
+                else
+                    warnlog "Svm should not have been selected when we opened a '" + Filetype + "'-file."
+                endif
+                case "wmf" : if (Filetype = "wmf") OR (Filetype = "emf") then
+                    printlog "   " + Filetype + " will be saved as Wmf, correct."
+                    CounterShouldBe = 17
+                if Filetype = "wmf" then Testsize = true
+                else
+                    warnlog "Wmf should not have been selected when we opened a '" + Filetype + "'-file."
+                endif
+                case "jpe" : if (Filetype = "jpg") OR Filetype = "jif" OR Filetype = "peg" then
+                    printlog "   " + Filetype + " will be saved as Jpg, correct."
+                    CounterShouldBe = 17
+                    if Filetype = "jpg" then Testsize = true
+                else
+                    warnlog "Jpg should not have been selected when we opened a '" + Filetype + "'-file."
+                endif
+                case "tif" : if Filetype = "tif" OR Filetype = "iff" then
+                    printlog "   " + Filetype + " will be saved as Tiff, correct."
+                    CounterShouldBe = 17
+                if Filetype = "tif" then Testsize = true
+                else
+                    warnlog "Tif should not have been selected when we opened a '" + Filetype + "'-file."
+                endif
+                case "sgf" : if (Filetype = "sgv") OR (Filetype = "sgf") then
+                    printlog "   " + Filetype + " will be saved as Sgf, correct."
+                    CounterShouldBe = 17
+                if Filetype = "sgf" then Testsize = true
+                else
+                    warnlog "Sgf should not have been selected when we opened a '" + Filetype + "'-file."
+                endif
+                case "gif" : if (Filetype = "gif") then
+                    printlog "   " + Filetype + " will be saved as Gif, correct."
+                    CounterShouldBe = 17
+                if Filetype = "gif" then Testsize = true
+                else
+                    warnlog "Gif should not have been selected when we opened a '" + Filetype + "'-file."
+                endif
+                case "met" : if (Filetype = "met") then
+                    printlog "   " + Filetype + " will be saved as Met, correct."
+                    CounterShouldBe = 17
+                if Filetype = "met" then Testsize = true
+                else
+                    warnlog "Met should not have been selected when we opened a '" + Filetype + "'-file."
+                endif
+                case "pct" : if (Filetype = "pct") OR (Filetype = "ict") then
+                    printlog "   " + Filetype + " will be saved as Pct, correct."
+                    CounterShouldBe = 17
+                if Filetype = "pct" then Testsize = true
+                else
+                    warnlog "Pct should not have been selected when we opened a '" + Filetype + "'-file."
+                endif
+                case else  : qaerrorlog "   The test has not yet been fitted for this format ( " + Filetype + "). Contact FHA."
+                    printlog "   But will be saved as: " + left(lcase(Dateityp.GetSelText),3)
+                    CounterShouldBe = 18
+                    Testsize = true
+            end select
 
     '..........................................................................................................................'
 
-    Dateityp.TypeKeys "<HOME>"
-    if (Dateityp.GetItemCount) = CounterShouldBe then  'Counter - 10
-        for q = 1 to CounterShouldBe - 1
-            LastFilterName = Dateityp.GetSelIndex
-            Dateityp.TypeKeys "<DOWN>"
-            if Dateityp.GetSelIndex = LastFilterName then
-                warnlog "   Check the export-filters when trying to save a " + Filename + "-file. Exiting test."
-                goto endsub
+            Dateityp.TypeKeys "<HOME>"
+            if (Dateityp.GetItemCount) = CounterShouldBe then  'Counter - 10
+                for q = 1 to CounterShouldBe - 1
+                    LastFilterName = Dateityp.GetSelIndex
+                    Dateityp.TypeKeys "<DOWN>"
+                        if Dateityp.GetSelIndex = LastFilterName then
+                            warnlog "   Check the export-filters when trying to save a " + Filename + "-file. Exiting test."
+                            goto endsub
+                        endif
+                next q
+            else
+                warnlog "Dateityp.GetItemCount  = " + (Dateityp.GetItemCount) + "  CounterShouldBe =  " + CounterShouldBe
             endif
-        next q
-    else
-        warnlog "Dateityp.GetItemCount  = " + (Dateityp.GetItemCount) + "  CounterShouldBe =  " + CounterShouldBe
-    endif
 
     Dateityp.Select SavedOrgPosition
 
@@ -472,6 +472,16 @@ testcase tContextSavePictureLinkAsPicture
             Found = true
             SavedOrgPosition = Dateityp.GetSelIndex
             select case left(lcase(Dateityp.GetSelText),3) 'Filetype
+
+            case "svg" : if (filetype = "svg") then
+                printlog "   " + Filetype + " will be saved as svg, correct."
+                SavedFileType = "svg"
+                Testsize = true
+                CounterShouldBe = 17
+            else
+                warnlog "svg should not have been selected when we opened a '" + Filetype + "'-file."
+            endif
+            
             case "png" : if (Filetype = "png") then
                 printlog "   " + Filetype + " will be saved as png, correct."
                 SavedFileType = "png"