CWS-TOOLING: integrate CWS impress168

2009-04-24 11:26:33 +0200 wg  r271204 : i101157
2009-04-24 10:17:59 +0200 wg  r271200 : i101157
2009-04-23 15:50:12 +0200 wg  r271178 : i101157
2009-04-23 15:16:58 +0200 wg  r271176 : i101157
2009-04-23 13:04:41 +0200 wg  r271158 : i101157
2009-04-22 15:39:32 +0200 wg  r271123 : i101157
2009-04-22 14:27:24 +0200 wg  r271111 : i101157
2009-04-22 14:14:02 +0200 wg  r271109 : i101157
2009-04-17 14:34:19 +0200 wg  r270946 : i101157
2009-04-17 13:49:15 +0200 wg  r270939 : i101157
2009-03-31 14:54:52 +0200 sj  r270281 : CWS-TOOLING: rebase CWS impress168 to trunk@270033 (milestone: DEV300:m45)
2009-03-26 16:56:44 +0100 sj  r270089 : removed invalid file names
2009-03-24 14:02:54 +0100 sj  r269944 : CWS-TOOLING: rebase CWS impress168 to trunk@269781 (milestone: DEV300:m44)
2009-03-06 16:32:14 +0100 sj  r269020 : #i99970# importing customshapes without group object, taking care of the correct text alignment
2009-02-27 13:53:24 +0100 sj  r268591 : #158501,158483# fixed positioning problem of 3d customshapes
2009-02-19 16:02:00 +0100 sj  r268292 : #76543# fixed interactive hyperlink program action with relativ url
2009-02-18 15:36:52 +0100 sj  r268233 : #158503# added import of circular gradients for ellipse shapes
2009-02-16 19:51:54 +0100 sj  r267836 : #i99146# calculating correct text bounds
2009-02-12 13:59:46 +0100 sj  r267654 : #i96179# fixed bullet problem
2009-02-10 17:26:41 +0100 sj  r267566 : #158476# fixed import of the ribbon shape
2009-02-10 17:10:27 +0100 cl  r267561 : #i95364# fixed type detection of linked images
2009-02-09 18:31:59 +0100 cl  r267531 : #i98352# removed assertion
2009-02-09 18:31:17 +0100 cl  r267530 : #i98355# fixed alien attribute import for sd in binfilter
2009-02-09 18:30:53 +0100 cl  r267529 : #i98355# fixed alien attribute import for sd in binfilter
2009-02-09 09:52:15 +0100 cl  r267501 : #i98573# fixed build error
2009-02-06 17:02:21 +0100 sj  r267476 : #i96179# fixed bullet problem
2009-02-06 14:58:39 +0100 cl  r267466 : #i14832# fixed page count field for handout printing
2009-02-06 10:23:01 +0100 cl  r267447 : #i98573# fixed GetEditOutlinerParaObject() memory leak
2009-02-05 18:03:34 +0100 cl  r267435 : #i98573# fixed GetEditOutlinerParaObject() memory leak
2009-02-05 18:03:08 +0100 cl  r267434 : #i85481# added XMultiPropertyStates to text implementations
2009-02-05 18:02:54 +0100 cl  r267433 : #i85481# added XMultiPropertyStates to text implementations
2009-02-05 18:02:42 +0100 cl  r267432 : #i85481# added XMultiPropertyStates to text implementations
2009-02-04 18:54:46 +0100 sj  r267400 : #i33630# fixed arrow size of word import
2009-02-04 15:40:16 +0100 cl  r267389 : #i58702# fixed tiled bitmap fill for vcl canvas
2009-02-04 15:39:07 +0100 cl  r267388 : #i58702# fixed tiled bitmap fill for vcl canvas
2009-02-04 14:23:27 +0100 cl  r267382 : #i98573# fixed memory leaks caused by wron usage of GetEditOutlinerParaObject()
2009-02-04 14:22:34 +0100 cl  r267381 : #i98573# fixed memory leaks caused by wron usage of GetEditOutlinerParaObject()
2009-02-04 12:51:50 +0100 cl  r267371 : #i14832# added Page Count field to impress
2009-02-04 12:41:31 +0100 cl  r267368 : #i14832# added Page Count field to impress

6 files changed, 307 insertions, 266 deletions

diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid
index 36a55582413c..b4f6919ead84 100644
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@ -383,6 +383,7 @@ InsertFieldsTimeFix SID_INSERT_FLD_TIME_FIX
 InsertFieldsTimeVariable SID_INSERT_FLD_TIME_VAR
 InsertFieldsAuthorDraw SID_INSERT_FLD_AUTHOR
 InsertFieldsPageNumberDraw SID_INSERT_FLD_PAGE
+InsertFieldsPageCountDraw .uno:InsertPagesField
 InsertFieldsFileName SID_INSERT_FLD_FILE
 InsertHyperlinkDialog .uno:HyperlinkDialog
 InsertScanSelectSource SID_TWAIN_SELECT
diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc
index 5725417d50a5..10a4523f0a23 100755
--- a/testautomation/graphics/optional/includes/global/g_clipboard.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc
@@ -61,14 +61,9 @@ testcase tiEditUndo
     
     hFileOpen ConvertPath (sDatei)
     sleep 5
-    ' check if the document is writable
-    if fIsDocumentWritable = false then
-     ' make the document writable and check if it's succesfull
-     if fMakeDocumentWritable = false then
-        warnlog "The document can't be made writeable. Test stopped."
-        goto endsub
-     endif
-    endif
+    printlog "Checking for readonly state. If so, make it editable."
+    sMakeReadOnlyDocumentEditable
+
     hTypeKeys "<TAB><TAB>"
     sleep 3
     ContextPositionAndSize
diff --git a/testautomation/graphics/optional/includes/global/g_format.inc b/testautomation/graphics/optional/includes/global/g_format.inc
index 59a2d49fd53d..6ba987346dae 100755
--- a/testautomation/graphics/optional/includes/global/g_format.inc
+++ b/testautomation/graphics/optional/includes/global/g_format.inc
@@ -698,21 +698,23 @@ testcase tiFormat3D_Effekte
     Dim Rund  as string
     Dim Skal  as string
     Dim Tief  as string
-    Dim Winkel  as string                       '/// get value for angle ///'
+    Dim Winkel  as string                       ' get value for angle
     Dim X as string
     Dim y as integer
     Dim i as integer
     Dim Zaehler as integer
     Dim Posi as string
 
-    Call hNewDocument                              '/// new document ///'
+    Call hNewDocument                              
+    printlog "new document"
     '-----------------------------------RECTANGLE------------------------------------------------------
-    Call hRechteckErstellen (20,20,60,70)         '/// create rectangle ///'
+    Call hRechteckErstellen (20,20,60,70)        '/// create rectangle ///'
     WaitSlot (1000)
     ContextPositionAndSize                        '/// get position and size of rectangle ///'
         Kontext
         Active.SetPage TabPositionAndSize
         Kontext "TabPositionAndSize"
+        PositionX.SetText "5"
         X=PositionX.GetText
         printlog "--- created RECTANGLE; xPosition @ "+ x
         TabPositionAndSize.OK
@@ -959,6 +961,7 @@ testcase tiFormat3D_Effekte
         Kontext
         Active.SetPage TabPositionAndSize
         Kontext "TabPositionAndSize"
+        PositionX.SetText "5,00cm"
         Posi=PositionX.GetText
         TabPositionAndSize.OK
     WaitSlot (1000)
@@ -997,7 +1000,7 @@ testcase tiFormat3D_Effekte
         endif
         TabPositionAndSize.OK
     Kontext "Drei_D_Effekte"
-    '/// close document ///'
+    printlog "close document"
     Drei_D_Effekte.Close
     Call hCloseDocument
 endcase 'tiFormat3D_Effekte
diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc
index 8f5a4ea1549d..984ec7251d4a 100755
--- a/testautomation/graphics/optional/includes/global/g_insert.inc
+++ b/testautomation/graphics/optional/includes/global/g_insert.inc
@@ -169,94 +169,98 @@ endcase 'tInsertFloatingFrame
 '-------------------------------------------------------------------------------
 testcase tInsertFields
 
-   dim sTemp as string
-   dim sFile as string
-   dim i as integer
-
+    dim sTemp as string
+    dim sFile as string
+    dim i as integer
+    
     if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
     end if
+    
+    Call hNewDocument           
+    printlog " new document "
 
-   printlog " open application "
-   Call hNewDocument           
-   printlog " new document "
-
-   printlog " open 'tools->options' and set first/last name and email adress on the page 'StarOffice->UserData' "
-   ToolsOptions
-   hToolsOptions ("STAROFFICE","USERDATA")
-   VorName.SetText "Garfield"
-   ZuName.SetText  "Peanuts"
-   EMail.SetText   "recumbent@sun.com"
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-
-   printlog " every item from menue 'Insert->Fields' is inserted, and the keys [Strg]+[A], [Delete] are pressed "
-   InsertFieldsDateFix            
-   printlog "  (date fix) "
-   EditSelectAll
-   hTypeKeys "<DELETE>"
-
-   InsertFieldsDateVariable       
-   printlog "  (date variable) "
-   EditSelectAll
-   hTypeKeys "<DELETE>"
-
-   InsertFieldsTimeFix            
-   printlog "  (time fix)"
-   EditSelectAll
-   hTypeKeys "<DELETE>"
-
-   InsertFieldsTimeVariable       
-   printlog "  (time variable) "
-   EditSelectAll
-   hTypeKeys "<DELETE>"
-
-   InsertFieldsAuthorDraw         
-   printlog "  (author) "
-   printlog "+ additional test for author "
-   printlog "+ it has to tbe 'Garfield Peanuts' "
-   hTypeKeys "<F2>"
-   EditSelectAll
-   EditCopy
-   sTemp = GetClipboard()
-   if (sTemp <> "Garfield Peanuts") then
+    printlog " open 'tools->options' and set first/last name and email adress on the page 'StarOffice->UserData' "
+    ToolsOptions
+    hToolsOptions ("STAROFFICE","USERDATA")
+    VorName.SetText "Garfield"
+    ZuName.SetText  "Peanuts"
+    EMail.SetText   "recumbent@sun.com"
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
+    
+    printlog " every item from menue 'Insert->Fields' is inserted, and the keys [Strg]+[A], [Delete] are pressed "
+    InsertFieldsDateFix            
+    printlog "  (date fix) "
+    EditSelectAll
+    hTypeKeys "<DELETE>"
+    
+    InsertFieldsDateVariable       
+    printlog "  (date variable) "
+    EditSelectAll
+    hTypeKeys "<DELETE>"
+    
+    InsertFieldsTimeFix            
+    printlog "  (time fix)"
+    EditSelectAll
+    hTypeKeys "<DELETE>"
+    
+    InsertFieldsTimeVariable       
+    printlog "  (time variable) "
+    EditSelectAll
+    hTypeKeys "<DELETE>"
+
+    InsertFieldsPageCountDraw
+    printlog "  (page count)"
+    EditSelectAll
+    hTypeKeys "<DELETE>"
+
+    InsertFieldsAuthorDraw         
+    printlog "  (author) "
+    printlog "+ additional test for author "
+    printlog "+ it has to tbe 'Garfield Peanuts' "
+    hTypeKeys "<F2>"
+    EditSelectAll
+    EditCopy
+    sTemp = GetClipboard()
+    if (sTemp <> "Garfield Peanuts") then
       Warnlog "wrong author; expected: 'Garfield Peanuts' is: '" + sTemp + "'"
-   else
+    else
       Printlog "Author is: '" + sTemp + "'"
-   endif
-   hTypeKeys "<Escape><Escape>"
-   EditSelectAll
-   hTypeKeys "<DELETE>"
-
-   for i = 1 to 2
-      InsertFieldsPageNumberDraw        
-      printlog "  (page number) "
-      printlog "+ additional test for pagenumber  "
-      printlog "+ it has to be '1' and should remain the same when we insert a new slide "
-      hTypeKeys "<F2>"
-      EditSelectAll
-      EditCopy
-      sTemp = GetClipboard()
-      if (sTemp <> right(str(i),1) ) then
-         if sTemp = 2 then
-            warnlog "Wrong number; expected it to still be: '1' but was: '" + sTemp + "'"
-         else
+    endif
+    hTypeKeys "<Escape><Escape>"
+    printlog "deleting content"
+    EditSelectAll
+    hTypeKeys "<DELETE>"
+
+    printlog "+ additional test for pagenumber  "
+    for i = 1 to 2
+        InsertFieldsPageNumberDraw        
+        printlog "Inserting page number. It has to be '1' and should remain the same when we insert a new slide "
+        hTypeKeys "<F2>"
+        EditSelectAll
+        EditCopy
+        sTemp = GetClipboard()
+        if (sTemp <> right(str(i),1) ) then
+            if sTemp = 2 then
+                warnlog "Wrong number; expected it to still be: '1' but was: '" + sTemp + "'"
+            else
+                printlog "Good. Number is: '" + sTemp + "'"
+            endif
+        else
             printlog "Good. Number is: '" + sTemp + "'"
-         endif
-      else
-         printlog "Good. Number is: '" + sTemp + "'"
-      endif
-      hTypeKeys "<Escape><Escape>"
-      EditSelectAll
-      hTypeKeys "<DELETE>"
-      printlog " Insert->Slide "
-      InsertSlide
-      sleep 2
+        endif
+        hTypeKeys "<Escape><Escape>"
+        EditSelectAll
+        hTypeKeys "<DELETE>"
+        printlog " Insert->Slide "
+        InsertSlide
+        sleep 2
    next i
 
-    printlog " and one try when we switch slides manually "
+    printlog "And one try when we switch slides manually, deleting slides to start."
    EditDeleteSlide
    EditDeleteSlide
 
@@ -264,7 +268,7 @@ testcase tInsertFields
       InsertFieldsPageNumberDraw        
       printlog "  (page number) "
       printlog "+ additional test for pagenumber  "
-      printlog "+ it has to chenge when we insert a new slide and press pagedown "
+      printlog "+ it has to change when we insert a new slide and press pagedown "
       hTypeKeys "<F2>"
       EditSelectAll
       EditCopy
@@ -289,13 +293,44 @@ testcase tInsertFields
       InsertSlide
       hTypeKeys "<PAGEDOWN>"
       sleep 2
-   next i
-
-   InsertFieldsFileName           
-   printlog "  (file name) "
-   printlog "+ additional test for filename "
-   printlog "+ save file as " + gOfficePath + "user\\work\\fields.od ?"
-   sFile = ConvertPath (gOfficePath + "user\work\fields"
+    next i
+    printlog "Additional test for Page Count:"
+    InsertFieldsPageCountDraw
+    hTypeKeys "<F2>"
+    EditSelectAll
+    EditCopy
+    sTemp = GetClipboard()
+    if sTemp <> "3" then
+        warnlog "Wrong page count detected!"
+    else
+        printlog "Page count " & sTemp & " was expected."
+    endif
+    hTypeKeys "<Escape><Escape>"
+
+    printlog "checking of page count changes if slide is inserted"
+    InsertSlide
+    hTypeKeys "<PAGEUP>"
+    EditSelectAll
+    hTypeKeys "<F2>"
+    EditSelectAll
+    EditCopy
+    sTemp = GetClipboard()
+    if sTemp <> "4" then
+        warnlog "Wrong page count detected!"
+    else
+        printlog "Page count " & sTemp & " was expected and updated correctly."
+    endif
+    
+    hTypeKeys "<Escape><Escape>"
+    printlog "deleting all"
+    EditSelectAll
+    hTypeKeys "<DELETE>"
+    
+    InsertFieldsFileName           
+    printlog "  (file name) "
+    printlog "+ additional test for filename "
+    printlog "+ save file as " + gOfficePath + "user\\work\\fields.od ?"
+    sFile = ConvertPath (gOfficePath + "user\work\fields"
     if FileExists(sFile + "." + ExtensionString) then
         kill (sFile + "." + ExtensionString)
     end if
diff --git a/testautomation/graphics/optional/includes/global/gallery.inc b/testautomation/graphics/optional/includes/global/gallery.inc
index fa81a94330b5..9175441e0f64 100755
--- a/testautomation/graphics/optional/includes/global/gallery.inc
+++ b/testautomation/graphics/optional/includes/global/gallery.inc
@@ -268,18 +268,16 @@ endcase
 testcase tGallery_CreateAndWorkWithANewGalleryThemes
     Dim iMenuEntries as Integer
     Dim j as Integer
-    '/// Open a new Writer document
-    '/// Tools / Gallery
+    printlog "Open a new Writer document"
+    printlog "Tools / Gallery"
     printlog "create a new gallery-theme ( TT-theme )"
     gApplication = "WRITER"
     call hNewDocument
     call hOpenGallery
     iMenuEntries = Gallerys.GetItemCount
     printlog "- Clicking on 'New Theme' and creating a new theme"
-    '/// Create a new gallery-theme
-    '/// + by clicking on <i>New Theme</i>
     NewTheme.Click
-    '/// +Activate <i>General</i> tabpage and insert <b><i>TT-theme</b></i> as name
+    printlog "+Activate General tabpage and insert TT-theme as name"
     Kontext
     Active.SetPage TabAllgemeinGallery
     Kontext "TabAllgemeinGallery"
@@ -287,177 +285,192 @@ testcase tGallery_CreateAndWorkWithANewGalleryThemes
     sleep (1)
     printlog "  - named the new theme 'TT-theme' on the general-page"
     printlog "  - insert all files out of '[gTestToolpath]\global\input\graf_inp' in the files-page"
-    '/// +Activate <i>Files</i> tabpage
+    printlog "+Activate Files tabpage"
     Kontext
     Active.SetPage TabDateien
     Kontext "TabDateien"
     printlog "     - click 'add' without a selected file => insert-graphic-dialog has to be be visible"
-    '/// +Click on <i>Add</i> (If no file is selected the <i>Graphic-Insert</i> dialog has to be be opened -> close it)
+    printlog "+Click on Add (If no file is selected the Graphic-Insert dialog has to be be opened -> close it)"
     Hinzufuegen.Click
     sleep (1)
     Kontext "GrafikEinfuegenDlg"
     GrafikEinfuegenDlg.Cancel
     sleep (1)
     printlog "     - click 'find files' to insert the path for graphics"
-    '///+Click on <i>Find Files</i> => <i>select-path</i> dialog will be visible
+    printlog "+Click on Find Files => select-path dialog will be visible"
     Kontext "TabDateien"
     Suche.Click
     sleep (1)
-    '/// +Insert [gTesttoolPath]/input/global/graf_inp as path-name as click on <i>Select</i>
+    printlog "+Insert [gTesttoolPath]/input/global/graf_inp as path-name as click on Select"
     Kontext "OeffnenDlg"
     Pfad.SetText ( convertPath ( gTesttoolPath + "global\input\graf_inp" ) )
     sleep (1)
     Auswaehlen.Click
     sleep (10)
-    '/// +Click on <i>Add</i> for some graphics
+    printlog "+Click on Add for some graphics"
     printlog "     - 'add' one by one"
     Kontext "TabDateien"
     DateiListe.Select 1
     WaitSlot(1000)
     Hinzufuegen.Click
+    printlog "Checking if Apply window is closed"
+    Kontext "ApplyGallery"
+    for j=1 to 100
+        if ApplyGallery.Exists then
+            sleep (1)
+        else
+            j=101
+        endif
+    next j
+    
     sleep (1)
+    Kontext "TabDateien"
+    printlog "add the 2nd one"
     DateiListe.Select 1
     Hinzufuegen.Click
+    printlog "Checking if Apply window is closed"
+    Kontext "ApplyGallery"
+    for j=1 to 100
+        if ApplyGallery.Exists then
+            sleep (1)
+        else
+            j=101
+        endif
+    next j
     sleep (1)
-    '/// +Click on <i>Add all</i> for rest of the graphics
-    '/// +<ul><li>apply-dialog -> cancel</li></ul>
-    '/// +click on <i>Add all</i> for rest of the graphics
+    Kontext "TabDateien"
+
+    printlog "+Click on Add all for rest of the graphics"
     printlog "     - 'add all' for the rest of the files"
     DateiListe.Select 1
     HinzufuegenAlle.Click
-    sleep (10)
+    sleep (1)
     printlog "     - apply-dialog -> cancel"
     Kontext "ApplyGallery"
-            for j=1 to 100
-                if ApplyGallery.Exists then
-                    try
-                        ApplyGallery.Cancel
-                    catch
-                    endcatch
+    for j=1 to 100
+        if ApplyGallery.Exists then
+            sleep (1)
+        else
+            j=101
+        endif
+    next j
+    sleep (1)
+    Kontext "TabDateien"
+   
+    if DateiListe.GetItemCount > 1 then
+        printlog "     - 'add all' for the rest of the files"
+        DateiListe.Select 1
+        HinzufuegenAlle.Click
+        sleep (2)
+        Kontext "ApplyGallery"
+        for j=1 to 100
+            If ApplyGallery.Exists then
+                sleep (1)
+            else
+                j=101
+            end if
+        next j
+    end if
+    Kontext "TabDateien"
+    printlog "  - click 'OK' for the tabpages"
+    TabDateien.OK
+    printlog "+Check if the new entry is inserted and select it"
+    printlog "  - check if the new entrie is inserted and select it"
+    Kontext "Gallery"
+    if Gallerys.GetItemCount <> ( iMenuEntries + 1 ) then
+        warnlog "No new theme was created => the test ends here"
+        ToolsGallery
+        call hCloseDocument
+    else
+        printlog "make mouseclick to set focus"
+        gMouseClick 50,50            
+        Kontext "Gallery"
+        Gallerys.Select "TT-theme"
+        Gallerys.MouseMove ( 10, 10 )
+        sleep (1)
+        Gallerys.OpenContextMenu
+        printlog "+Update the entry (1. entry in context menu ) => cancel it"
+        sleep (3)
+        hMenuSelectNr (1)
+        sleep (1)
+        Kontext "AktualisierenGallery"
+        if AktualisierenGallery.Exists <> TRUE then
+            AktualisierenGallery.Cancel
+        end if
+        do
+        sleep 1
+        loop while AktualisierenGallery.Exists
+        Kontext "Gallery"
+        Gallerys.Select "TT-theme"
+        Gallerys.OpenContextMenu
+        printlog "+Update it (1. entry in context menu )"
+        sleep (3)
+        hMenuSelectNr (1)
+        for j=1 to 100
+            Kontext "AktualisierenGallery"
+                if AktualisierenGallery.Exists <> TRUE then
+                    j=101
                 else
-                    if j>5 then j=101
-                        sleep (1)
-                    end if
-                next j
+                    sleep (1)
+                end if
+        next j
+        printlog "  - rename ( 3. entry in context-menu )"
+        Kontext "Gallery"
+        Gallerys.OpenContextMenu
+        sleep (3)
+        hMenuSelectNr (3)
+        Kontext "GalleryNewTitle"
+        Title.SetText "New TT-theme"
+        GalleryNewTitle.OK
+        Kontext "Gallery"
+        Gallerys.Select "New TT-theme"
+        printlog "  - add new graphics in properties ( 4. entry in context-menu )"
+        Kontext "Gallery"
+        Gallerys.OpenContextMenu
+        sleep (3)
+        hMenuSelectNr (4)
+        Kontext
+        Active.SetPage TabDateien
         Kontext "TabDateien"
-        if DateiListe.GetItemCount > 1 then
-            printlog "     - 'add all' for the rest of the files"
-            DateiListe.Select 1
-            HinzufuegenAlle.Click
-            sleep (2)
-            Kontext "ApplyGallery"
-                for j=1 to 100
-                    If ApplyGallery.Exists then
-                        sleep (1)
-                    else
-                        j=101
-                    end if
-                next j
-        end if
+        Suche.Click
+        Kontext "OeffnenDlg"
+        Pfad.SetText ( convertPath ( gTesttoolPath + "global\input\graf_inp" ) )
+        Auswaehlen.Click
+        sleep (10)
         Kontext "TabDateien"
-            printlog "  - click 'OK' for the tabpages"
-            TabDateien.OK
-            '/// +Check if the new entry is inserted and select it
-            printlog "  - check if the new entrie is inserted and select it"
+        DateiListe.Select 1
+        Hinzufuegen.Click
+        TabDateien.OK
+        printlog "  - delete the entry ( 2. entry in context-menu )"
+        printlog "     - messagebox -> no"
         Kontext "Gallery"
-            if Gallerys.GetItemCount <> ( iMenuEntries + 1 ) then
-                warnlog "No new theme was created => the test ends here"
-                ToolsGallery
-                call hCloseDocument
-            else
-                gMouseClick 50,50            '/// make mouseclick to set focus ///'
-                Kontext "Gallery"
-                Gallerys.Select "TT-theme"
-                Gallerys.MouseMove ( 10, 10 )
-                sleep (1)
-                Gallerys.OpenContextMenu
-                '/// +Update the entry (1. entry in context menu ) => cancel it
-                printlog "  - update the entry => cancel the update"
-                sleep (3)
-                hMenuSelectNr (1)
-                sleep (1)
-                Kontext "AktualisierenGallery"
-                    if AktualisierenGallery.Exists <> TRUE then
-                        AktualisierenGallery.Cancel
-                    end if
-                    do
-                        sleep 1
-                    loop while AktualisierenGallery.Exists
-                    Kontext "Gallery"
-                        Gallerys.Select "TT-theme"
-                        Gallerys.OpenContextMenu
-                        '/// +Update it (1. entry in context menu )
-                        printlog "  - update"
-                        sleep (3)
-                        hMenuSelectNr (1)
-                        for j=1 to 100
-                            Kontext "AktualisierenGallery"
-                            if AktualisierenGallery.Exists <> TRUE then
-                                j=101
-                            else
-                                sleep (1)
-                            end if
-                        next j
-                    '/// +Rename it (3. entry in context menu)
-                    printlog "  - rename ( 3. entry in context-menu )"
-                    Kontext "Gallery"
-                        Gallerys.OpenContextMenu
-                        sleep (3)
-                        hMenuSelectNr (3)
-                        Kontext "GalleryNewTitle"
-                            Title.SetText "New TT-theme"
-                            GalleryNewTitle.OK
-                    Kontext "Gallery"
-                        Gallerys.Select "New TT-theme"
-                        '///+Add new files in properties (4. entry in context menu)
-                        printlog "  - add new graphics in properties ( 4. entry in context-menu )"
-                    Kontext "Gallery"
-                        Gallerys.OpenContextMenu
-                        sleep (3)
-                        hMenuSelectNr (4)
-                        Kontext
-                        Active.SetPage TabDateien
-                        Kontext "TabDateien"
-                            Suche.Click
-                            Kontext "OeffnenDlg"
-                                Pfad.SetText ( convertPath ( gTesttoolPath + "global\input\graf_inp" ) )
-                                Auswaehlen.Click
-                                sleep (10)
-                        Kontext "TabDateien"
-                            DateiListe.Select 1
-                            Hinzufuegen.Click
-                            TabDateien.OK
-                            '/// +Delete the entry (2. entry in context menu)
-                            printlog "  - delete the entry ( 2. entry in context-menu )"
-                            printlog "     - messagebox -> no"
-                    Kontext "Gallery"
-                        Gallerys.Select "New TT-theme"
-                        sleep (10)
-                        Gallerys.OpenContextMenu
-                        sleep (3)
-                        hMenuSelectNr (2)
-                        Kontext "Active"
-                            sleep (1)
-                            Active.No
-                            printlog "     - messagebox -> yes"
-                    Kontext "Gallery"
-                        sleep (1)
-                        Gallerys.Select "New TT-theme"
-                        sleep (1)
-                        Gallerys.OpenContextMenu
-                        sleep (3)
-                        hMenuSelectNr (2)
-                        Kontext "Active"
-                            Active.Yes
-                    try
-                        Kontext "Gallery"
-                        Gallerys.Select "New TT-theme"
-                        warnlog "The entry isn't deleted!"
-                    catch
-                    endcatch
-                end if
-            sleep 10
-        ToolsGallery
+        Gallerys.Select "New TT-theme"
+        sleep (5)
+        Gallerys.OpenContextMenu
+        sleep (3)
+        hMenuSelectNr (2)
+        Kontext "Active"
+        sleep (1)
+        Active.No
+        printlog "     - messagebox -> yes"
+        Kontext "Gallery"
+        sleep (1)
+        Gallerys.Select "New TT-theme"
+        sleep (1)
+        Gallerys.OpenContextMenu
+        sleep (3)
+        hMenuSelectNr (2)
+        Kontext "Active"
+        Active.Yes
+        try
+            Kontext "Gallery"
+            Gallerys.Select "New TT-theme"
+            warnlog "The entry isn't deleted!"
+        catch
+        endcatch
+    end if
+    sleep 10
+    ToolsGallery
     call hCloseDocument
 endcase
 
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
index 4f31ca9ea2be..157388e7106f 100755
--- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
@@ -43,27 +43,20 @@
 ' #1 tSlideShowCustomSlideShow
 ' #1 tSlideShowSlideTransition
 ' #1 tSlideShowShowHideSlide
-' #1 fGetSlideName
-' #1 setStartCurrentPage
 '*
 '\******************************************************************
 testcase tSlideShowSlideShow
 
-   dim bLoaded as boolean
-   dim i as integer
+    dim bLoaded as boolean
+    dim i as integer
 
-   '/// open file 'graphics\\input\\diashow.odp' ///'
-   hFileOpen  ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp")
-   sleep 30
+    '/// open file 'graphics\\input\\diashow.odp' ///'
+    hFileOpen  ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp")
+    sleep 30
+
+    printlog "check if the document is writable"
+    sMakeReadOnlyDocumentEditable
 
-    ' check if the document is writable
-    if fIsDocumentWritable = false then
-        ' make the document writable and check if it's succesfull
-        if fMakeDocumentWritable = false then
-            warnlog "The document can't be make writeable. Test stopped."
-            goto endsub
-        endif
-    endif
    bLoaded = false
 
    Kontext "Navigator"
@@ -151,7 +144,8 @@ testcase tSlideShowSlideShow
    setStartCurrentPage(TRUE)
    '/// close the application ///'
    Call hCloseDocument
-endcase
+   
+endcase 'tSlideShowSlideShow
 
 '-------------------------------------------------------------------------------
 
@@ -227,7 +221,8 @@ testcase tSlideShowRehearseTimings
    endif
    '/// close the application ///'
    Call hCloseDocument
-endcase
+   
+endcase 'tSlideShowRehearseTimings
 
 '-------------------------------------------------------------------------------
 testcase tSlideShowSlideShowSettings
@@ -305,14 +300,9 @@ testcase tSlideShowSlideShowSettings
    '/// open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides) ///'
    hFileOpen   ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp")
    sleep 10
-   ' check if the document is writable
-   if fIsDocumentWritable = false then
-      ' make the document writable and check if it's succesfull
-      if fMakeDocumentWritable = false then
-         warnlog "The document can't be make writeable. Test stopped."
-         goto endsub
-      endif
-   endif
+   printlog "check if the document is writable"
+   sMakeReadOnlyDocumentEditable
+
    try
       Kontext "DocumentImpress"
       '/// Slide Show -> Slide Show Settings ///'
@@ -710,7 +700,8 @@ testcase tSlideShowSlideShowSettings
    setStartCurrentPage(TRUE)
    '/// Close the document ///'
    call hCloseDocument
-endcase
+   
+endcase 'tSlideShowSlideShowSettings
 
 '-------------------------------------------------------------------------------
 testcase tSlideShowCustomSlideShow
@@ -870,7 +861,8 @@ testcase tSlideShowCustomSlideShow
          printlog "Navigator: NOT available"
       end if
       Call hCloseDocument
-endcase
+      
+endcase 'tSlideShowCustomSlideShow
 
 '-------------------------------------------------------------------------------
 testcase tSlideShowSlideTransition
@@ -1124,7 +1116,8 @@ testcase tSlideShowSlideTransition
    end if
    '/// Close the document ///'
    call hCloseDocument
-endcase
+   
+endcase 'tSlideShowSlideTransition
 
 '-------------------------------------------------------------------------------------
 testcase tSlideShowShowHideSlide
@@ -1239,6 +1232,7 @@ testcase tSlideShowShowHideSlide
         printlog "Navigator: NOT available"
     endif
     Call hCloseDocument
-endcase
+    
+endcase 'tSlideShowShowHideSlide
 
 '------------------------------------------------------------------------------