Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

Conflicts: smoketestoo_native/data/Global.xml smoketestoo_native/data/OptionsDlg.xml smoketestoo_native/data/Test_10er.xml smoketestoo_native/data/content.xml smoketestoo_native/smoketest.cxx test/source/cpp/getargument.cxx test/source/cpp/officeconnection.cxx testautomation/framework/optional/includes/basic_vba-compat_security_check.inc testautomation/framework/optional/includes/filedlg_cjk_folders.inc testautomation/global/sid/all.sid testautomation/global/sid/bars.sid testautomation/global/sid/e_all.sid testautomation/global/win/bars.win testautomation/graphics/optional/includes/impress/i_slideshow2.inc testautomation/graphics/optional/includes/impress/i_slideshow3.inc testtools/source/bridgetest/bridgetest.cxx testtools/source/bridgetest/constructors.cxx testtools/source/bridgetest/makefile.mk testtools/source/bridgetest/testComponent.component
author: Michael Meeks <michael.meeks@novell.com> 2011-03-11 11:35:29 +0000
committer: Michael Meeks <michael.meeks@novell.com> 2011-03-11 11:35:29 +0000
commit: 8c59580b88a33d7f0c892c9c53776716ad661fcf (patch)
tree: da43a9c8f3ba7cba7afca05894acc8712f6e36ce /testautomation/framework/optional/includes
parent: e62f74cabe9558e003d3105df7a69e3841dfc9ce (diff)
parent: 36979f1c9e43c42e62b0ad5a32b7abb2fc425b5b (diff)
105 files changed, 731 insertions, 360 deletions
diff --git a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
index aaefdcd5bafb..d450415dd970 100755..100644
--- a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
+++ b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
@@ -496,7 +496,8 @@ testcase tStrokeSort
 
     Dim i , j                 as Integer
 
-    testFile         = "sortTest.sxw"
+    testFile         = gTesttoolPath & "framework\optional\input\CJK\sortTest.sxw"
+    testFile         = convertpath( testFile )
     aCorrectSequence = Array( "1" , "2" , "3" , "4" ,"5" )
 
     j = UBound(aCorrectSequence)
@@ -527,9 +528,8 @@ testcase tStrokeSort
 
     Call hNewDocument
     '/// Open a test file and check <i>No Grid</i> checkbox
-    Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile )
-    sMakeReadOnlyDocumentEditable
-    EditSelectAll
+    hFileOpenLocally( testfile )
+    hUseAsyncSlot( "EditSelectAll" )
 
     '/// Open <i>Tools/Sort</i>
     ToolsSort
@@ -572,6 +572,7 @@ testcase tStrokeSort
     next i
 
     Call hCloseDocument
+    hFileDelete( gLastWorkFile )
 
 endcase
 
@@ -586,7 +587,9 @@ testcase tPinyinSort
 
     Dim i , j                 as Integer
 
-    testFile         = "sortTest.sxw"
+    testFile         = gTesttoolPath & "framework\optional\input\CJK\sortTest.sxw"
+    testFile         = convertpath( testFile )
+
     aCorrectSequence = Array( "2" , "3" , "4" , "1" , "5"  )
 
     j = UBound(aCorrectSequence)
@@ -617,9 +620,8 @@ testcase tPinyinSort
 
     Call hNewDocument
     '/// Open a test file and check <i>No Grid</i> checkbox
-    Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile )
-    sMakeReadOnlyDocumentEditable
-    EditSelectAll
+    hFileOpenLocally( testfile )
+    hUseAsyncSlot( "EditSelectAll" )
 
     '/// Open <i>Tools/Sort</i>
     ToolsSort
@@ -664,6 +666,7 @@ testcase tPinyinSort
     next i
 
     Call hCloseDocument
+    hFileDelete( gLastWorkFile )
 
 endcase
 
diff --git a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
index 081b35f322ec..63f552df63bf 100755
--- a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
+++ b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
@@ -346,7 +346,8 @@ testcase tWriterUIChangesTest7
             Kontext "RubyDialog"
             DialogClose.Click
             Sleep 2
-            QAErrorlog "#i40913# Something wrong in menu format/Ruby when Asian Language support is off"
+            '#i40913# 
+            warnlog "Something wrong in menu format/Ruby when Asian Language support is off"
         catch
         endcatch
     end if
@@ -398,25 +399,29 @@ testcase tWriterUIChangesTest8
 
         try
             FormatChangeCaseHalfWidth
-            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Half width when Asian Language support is off"
+            '#i43434# 
+            warnlog "Something wrong in submenu format/change case -> Half width when Asian Language support is off"
         catch
         endcatch
 
         try
             FormatChangeCaseFullWidth
-            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Full width when Asian Language support is off"
+            '#i43434# 
+            warnlog "Something wrong in submenu format/change case -> Full width when Asian Language support is off"
         catch
         endcatch
 
         try
             FormatChangeCaseHiragana
-            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Hiragana when Asian Language support is off"
+            '#i43434# 
+            warnlog "Something wrong in submenu format/change case -> Hiragana when Asian Language support is off"
         catch
         endcatch
 
         try
             FormatChangeCaseKatagana
-            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Katagana when Asian Language support is off"
+            '#i43434# 
+            warnlog "Something wrong in submenu format/change case -> Katagana when Asian Language support is off"
         catch
         endcatch
     end if
@@ -740,4 +745,4 @@ function hSystemHasAsianLocale() as boolean
     case else           : hSystemHasAsianLocale() = false
     end select
 
-end function
-\ No newline at end of file
+end function
diff --git a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
index ab6e04c33e3a..ab6e04c33e3a 100755..100644
--- a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
+++ b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
diff --git a/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc b/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc
index 13411aeb849f..13411aeb849f 100755..100644
--- a/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc
+++ b/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc
diff --git a/testautomation/framework/optional/includes/basic_delete_modules.inc b/testautomation/framework/optional/includes/basic_delete_modules.inc
index c35900b012e4..72a073f9d68b 100755..100644
--- a/testautomation/framework/optional/includes/basic_delete_modules.inc
+++ b/testautomation/framework/optional/includes/basic_delete_modules.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Delete modules while BASIC is running
 '*
diff --git a/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc b/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc
index c3db79efc08d..f9b28ff67180 100755..100644
--- a/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc
+++ b/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : Joerg.Skottke@Sun.Com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Copy a control with i18n data
 '*
diff --git a/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc b/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc
index 89d5614c5b11..6d31d635bc55 100755..100644
--- a/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc
+++ b/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test correct handling of the default language
 '*
diff --git a/testautomation/framework/optional/includes/basic_documents.inc b/testautomation/framework/optional/includes/basic_documents.inc
index 7e6613cdfcbc..1f2d62eaa70c 100755..100644
--- a/testautomation/framework/optional/includes/basic_documents.inc
+++ b/testautomation/framework/optional/includes/basic_documents.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : BASIC organizers and documents
 '*
diff --git a/testautomation/framework/optional/includes/basic_eventbinding.inc b/testautomation/framework/optional/includes/basic_eventbinding.inc
index 4d5ee502df66..4d5ee502df66 100755..100644
--- a/testautomation/framework/optional/includes/basic_eventbinding.inc
+++ b/testautomation/framework/optional/includes/basic_eventbinding.inc
diff --git a/testautomation/framework/optional/includes/basic_formcontrols.inc b/testautomation/framework/optional/includes/basic_formcontrols.inc
index cc8f999ff9ad..36a4ae35e1ab 100755..100644
--- a/testautomation/framework/optional/includes/basic_formcontrols.inc
+++ b/testautomation/framework/optional/includes/basic_formcontrols.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Basic form-controls
 '*
@@ -122,7 +122,7 @@ testcase tAllControlsOnDialog( cMajor as string )
         if ( hFindFirstDialog() ) then
             printlog( "First dialog found. Good." )
         else
-            warnlog( "Could not access dialog, aborting test" )
+            warnlog( "#i115117 - Could not access dialog, accelerator not working? (Test interrupted)" )
             hCloseBasicIde()
             hDestroyDocument()
             goto endsub
diff --git a/testautomation/framework/optional/includes/basic_gridcontrol.inc b/testautomation/framework/optional/includes/basic_gridcontrol.inc
index 5cfbc4e0b879..95bad4d09463 100644
--- a/testautomation/framework/optional/includes/basic_gridcontrol.inc
+++ b/testautomation/framework/optional/includes/basic_gridcontrol.inc
@@ -32,39 +32,24 @@
 '\******************************************************************************
 
 testcase tGridcontrolLoad
-    dim sLocation as string
-    dim i,x,a as integer
-    dim sTemp as string
-    dim lFiles(200) as string
-    dim bTemp as boolean
-    dim iError, iOK as integer
-    
-    sLocation = "framework/optional/include/basic_gridcontrol.inc::"
+    const MACRO_NAME = "Show"
+    const FILE_NAME  = "framework/optional/input/gridcontrol.odt"
 
-    hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW )
+    dim i as integer
+    dim a as integer
 
-    printlog "Open the test document"
-    call hFileOpen(convertPath(gTestToolPath + "framework/optional/input/gridcontrol.odt"))
-    printlog "Security dialog might come up"
-    kontext "SecurityWarning"
-    if SecurityWarning.exists(5) then
-        printlog "Allow to run macros"
-        SecurityWarning.ok
-    endif
-    call sleep 1
-    call sMakeReadOnlyDocumentEditable
-    call sleep 1
+    printlog( "Open the test document: " & FILE_NAME )
+    call hFileOpenLocally( gTestToolPath & FILE_NAME )
 
     printlog "Start the macro, that performs the test"
-    Kontext "GridControlDialogStarter"
- ' FAILS IF DOCUMENT IS READONLY....
-    ShowGridcontrol.typeKeys "<space>"
+    hExecMacro( MACRO_NAME )
+    
     Kontext "GridControlDialog"
     if GridControlDialog.exists(5) then
         for i=1 to gridcontrolcontrol.getcolumncount
-        for a=1 to gridcontrolcontrol.getrowcount
-            printlog " " + i + ":"+a+": '" + gridcontrolcontrol.getitemtype (i,a) + "' '" + gridcontrolcontrol.getitemtext (i,a) + "'"
-        next a
+            for a=1 to gridcontrolcontrol.getrowcount
+                printlog " " + i + ":"+a+": '" + gridcontrolcontrol.getitemtype (i,a) + "' '" + gridcontrolcontrol.getitemtext (i,a) + "'"
+            next a
         next i
         gridcontrolcontrol.select 5
 
@@ -76,37 +61,87 @@ testcase tGridcontrolLoad
             warnlog "No selection Event by .select"
         endif
 
-    Kontext "GridControlDialog"
+        Kontext "GridControlDialog"
         gridcontrolcontrol.typeKeys("<down>")
 
         kontext
         if active.exists(5) then
-        printlog active.gettext
-        active.ok
+            printlog active.gettext
+            active.ok
         else
-        warnlog "No selection event by .typeKeys <down>"
+            warnlog "No selection event by .typeKeys <down>"
         endif
-    Kontext "GridControlDialog"
+        Kontext "GridControlDialog"
         gridcontrolcontrol.typeKeys("<up>")
         kontext
         if active.exists(5) then
-        printlog active.gettext
-        active.ok
+            printlog active.gettext
+            active.ok
         else
-        warnlog "No selection event by .typeKeys <up>"
+            warnlog "No selection event by .typeKeys <up>"
         endif
 
-    Kontext "GridControlDialog"
+        Kontext "GridControlDialog"
         GridControlDialog.close
     else
         warnlog "Gridcontrol Dialog did not come up after pressing button"
     endif
+
+    printlog( "Test exit, cleanup" )
+    hFileCloseAll()
+    hDeleteFile( gLastWorkFile )
+endcase
+
+
+testcase tTabcontrolLoad
+    const MACRO_NAME = "ShowTab"
+    const FILE_NAME  = "framework/optional/input/gridcontrol.odt"
+
+    dim i as integer
+    dim a as integer
+
+    printlog( "Open the test document: " & FILE_NAME )
+    call hFileOpenLocally( gTestToolPath & FILE_NAME )
+
+    printlog "Start the macro, that performs the test"
+    hExecMacro( MACRO_NAME )
     
-    printlog "clean up"
-    printlog "Close the document, else an error about the navigator will be thrown"
-    if getDocumentcount > 0 then
-        call hCloseDocument()
+    Kontext "tabcontroldialog"
+    if tabcontroldialog.exists(5) then
+        if tabcontainer.getPageCount = 2 then
+            printlog "There are 2 tabs"
+        else
+            warnlog "There are NOT 2 tabs, there are: " + tabcontainer.getpagecount
+        endif
+        if tabcontainer.getPage = "tabcontrol_1" then
+            printlog "Default tab page is page 1"
+        else
+            warnlog "Default tab page is NOT page 1"
+        endif
+        tabcontainer.setPage tabcontrol_2
+        wait 1000
+        if tabcontainer.getPage = "tabcontrol_2" then
+            printlog "Switching to tab 2 works"
+        else
+            warnlog "Switching to tab 2 failed"
+        endif
+        tabcontainer.setPage tabcontrol_1
+        wait 1000
+        if tabcontainer.getPage = "tabcontrol_1" then
+            printlog "Switching to tab 1 works"
+        else
+            warnlog "Switching to tab 1 failed"
+        endif
+
+        Kontext "tabcontroldialog"
+        tabcontroldialog.close
+    else
+        warnlog "tabcontrol Dialog did not come up after pressing button"
     endif
+
+    printlog( "Test exit, cleanup" )
+    hFileCloseAll()
+    hDeleteFile( gLastWorkFile )
 endcase
 
 
diff --git a/testautomation/framework/optional/includes/basic_ide.inc b/testautomation/framework/optional/includes/basic_ide.inc
index eabaadf3176a..6537b8f8c80f 100755..100644
--- a/testautomation/framework/optional/includes/basic_ide.inc
+++ b/testautomation/framework/optional/includes/basic_ide.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Macro Dialogs opened from Basic-IDE
 '*
diff --git a/testautomation/framework/optional/includes/basic_issues.inc b/testautomation/framework/optional/includes/basic_issues.inc
index 3fec49f61fbe..32ddb1390d85 100755..100644
--- a/testautomation/framework/optional/includes/basic_issues.inc
+++ b/testautomation/framework/optional/includes/basic_issues.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : Joerg.Skottke@Sun.Com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Regression tests for especially annoying BASIC issues
 '*
diff --git a/testautomation/framework/optional/includes/basic_library_export.inc b/testautomation/framework/optional/includes/basic_library_export.inc
index 9d539e2a82a0..942d87b25062 100755..100644
--- a/testautomation/framework/optional/includes/basic_library_export.inc
+++ b/testautomation/framework/optional/includes/basic_library_export.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Export BASIC library (flat)
 '*
diff --git a/testautomation/framework/optional/includes/basic_library_import.inc b/testautomation/framework/optional/includes/basic_library_import.inc
index f6b62e99c7ea..cb82055e95f1 100755..100644
--- a/testautomation/framework/optional/includes/basic_library_import.inc
+++ b/testautomation/framework/optional/includes/basic_library_import.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Import BASIC library (flat)
 '*
diff --git a/testautomation/framework/optional/includes/basic_macros.inc b/testautomation/framework/optional/includes/basic_macros.inc
index dc58e21f1dea..cc8ff04fb408 100755..100644
--- a/testautomation/framework/optional/includes/basic_macros.inc
+++ b/testautomation/framework/optional/includes/basic_macros.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : check macro-dialogs / BASIC-IDE ( 1. part )
 ' **
diff --git a/testautomation/framework/optional/includes/basic_modulehide.inc b/testautomation/framework/optional/includes/basic_modulehide.inc
index fe492590c41b..c6daea7e834f 100755..100644
--- a/testautomation/framework/optional/includes/basic_modulehide.inc
+++ b/testautomation/framework/optional/includes/basic_modulehide.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Verify that hiding modules works
 '*
diff --git a/testautomation/framework/optional/includes/basic_modulenames.inc b/testautomation/framework/optional/includes/basic_modulenames.inc
index 6b166c54680a..ed076927f2c1 100755..100644
--- a/testautomation/framework/optional/includes/basic_modulenames.inc
+++ b/testautomation/framework/optional/includes/basic_modulenames.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test modulenames on the tabbar
 '*
diff --git a/testautomation/framework/optional/includes/basic_modules.inc b/testautomation/framework/optional/includes/basic_modules.inc
index 14e3aedca6db..9a227484846c 100755..100644
--- a/testautomation/framework/optional/includes/basic_modules.inc
+++ b/testautomation/framework/optional/includes/basic_modules.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Edit several modules and dialogs in basic ide
 '*
diff --git a/testautomation/framework/optional/includes/basic_package_export.inc b/testautomation/framework/optional/includes/basic_package_export.inc
index b389c750e51d..6b80282185be 100755..100644
--- a/testautomation/framework/optional/includes/basic_package_export.inc
+++ b/testautomation/framework/optional/includes/basic_package_export.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Export BASIC libraries as package
 '*
diff --git a/testautomation/framework/optional/includes/basic_package_import.inc b/testautomation/framework/optional/includes/basic_package_import.inc
index 31596ed21001..ef9a5938c799 100755..100644
--- a/testautomation/framework/optional/includes/basic_package_import.inc
+++ b/testautomation/framework/optional/includes/basic_package_import.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Import BASIC library via Package Manager GUI as UNO Package
 '*
@@ -102,9 +102,7 @@ testcase tBasicPackageImport
     next iCurrentLib
     cLibraryName = BibliotheksListe.getSelText()
 
-    if ( not hClickButton( Hinzufuegen ) ) then
-        warnlog( "#i64007 - Office crashes on clicking import button" )
-    endif
+    hClickButton( Hinzufuegen )
     
     kontext "OeffnenDlg"
     hCloseDialog( OeffnenDlg, "cancel" )
diff --git a/testautomation/framework/optional/includes/basic_protected_libraries.inc b/testautomation/framework/optional/includes/basic_protected_libraries.inc
index 6162352d710f..3ea033129924 100755..100644
--- a/testautomation/framework/optional/includes/basic_protected_libraries.inc
+++ b/testautomation/framework/optional/includes/basic_protected_libraries.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test protected libraries
 '*
diff --git a/testautomation/framework/optional/includes/basic_shared_modules.inc b/testautomation/framework/optional/includes/basic_shared_modules.inc
index 63241fec9d7d..48f97094b449 100755..100644
--- a/testautomation/framework/optional/includes/basic_shared_modules.inc
+++ b/testautomation/framework/optional/includes/basic_shared_modules.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Access modules below OpenOffice.org macros
 '*
@@ -37,7 +37,7 @@ testcase tBasicSharedModules
     dim iObjectPosition as integer
     dim iLibraryCount as integer
 
-    const EXPECTED_LIBRARY_COUNT     = 13 ' prebundled extensions add a library
+    const EXPECTED_LIBRARY_COUNT     = 14 ' prebundled extensions add a library
     const EXPECTED_LIBRARY_COUNT_OOO = 12
     
     hInitSingleDoc()
diff --git a/testautomation/framework/optional/includes/basic_spectemplate.inc b/testautomation/framework/optional/includes/basic_spectemplate.inc
index eeed6b047141..245eab9115c9 100755..100644
--- a/testautomation/framework/optional/includes/basic_spectemplate.inc
+++ b/testautomation/framework/optional/includes/basic_spectemplate.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load the spec template via http and enable macros
 '*
@@ -94,10 +94,12 @@ testcase tBasicSpecTemplate
     printlog( "Load the file again" )
     hFileOpen( cWorkFile )
     hAllowMacroExecution()
+
+    ' This sleep here is needed after loading the document otherwise the document is closed too early during execution of the macros, which results in basic runtime error messagebox, that can not be handled.
+    SLEEP(1)
     
     printlog( "Cleanup: Close the document and delete the file" )
     hDestroyDocument()
     hDeleteFile( cWorkFile )
-
 endcase
 
diff --git a/testautomation/framework/optional/includes/basic_usertemplate.inc b/testautomation/framework/optional/includes/basic_usertemplate.inc
index 97ec55c91505..a96d4aa81406 100755..100644
--- a/testautomation/framework/optional/includes/basic_usertemplate.inc
+++ b/testautomation/framework/optional/includes/basic_usertemplate.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : My Macros/standard execution with user defined template
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc b/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc
index 9acd9d1b032e..39fd57f643f7 100755..100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*  
 '*  short description : Test VBA compatibility switches
 '*
@@ -58,11 +58,11 @@ testcase tBasicVBACompatApplicationUnion()
         macro_identifier( 5 ) = "5: False"
         macro_identifier( 6 ) = "6: True"
     else
-        macro_identifier( 1 ) = "1: True"
-        macro_identifier( 2 ) = "2: True"
+        macro_identifier( 1 ) = "1: False"
+        macro_identifier( 2 ) = "2: False"
         macro_identifier( 3 ) = "3: True"
-        macro_identifier( 4 ) = "4: True"
-        macro_identifier( 5 ) = "5: True"
+        macro_identifier( 1 ) = "4: False"
+        macro_identifier( 2 ) = "5: False"
         macro_identifier( 6 ) = "6: True"
     endif
 
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
index 81b2764a28f1..a3c8109941e2 100755..100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*  
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
index 970b8249a412..f889f77da58f 100755..100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
index dfade69eaafb..7959e5d3a8ac 100755..100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc b/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
new file mode 100644
index 000000000000..5589d5b420e6
--- /dev/null
+++ b/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
@@ -0,0 +1,105 @@
+'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 : gregor.hartmann@oracle.com
+'*
+'*  short description : Test VBA compatibility switches
+'*
+'\******************************************************************************
+
+testcase tBasicVBACompatSecurityCheck()
+
+    printlog( "Test VBA Security feature" )
+    printlog( "VBA macros may not ignore global macro security setting" )
+    
+    ' This test case is based on the use cases provided in issue #i109699
+    
+    const IMPORT_EXCEL_MACROS = TRUE
+    const EXEC_EXCEL_MACROS   = TRUE
+
+    const MACRO_IDENTIFICATION_MESSAGE = "Clicked"
+    const MACRO_NAME = "CommandButton1_Click"
+
+    const WORK_FILE = "framework/optional/input/vba-compat/Book1.xls"
+
+    dim cTestFile as string : cTestFile = gTesttoolPath & WORK_FILE
+    dim iSecurityLevel as integer
+
+
+    printlog( "Set VBA macro handling to import and execute" )
+    hSetExcelBasicImportMode( IMPORT_EXCEL_MACROS, EXEC_EXCEL_MACROS )
+
+    for iSecurityLevel = GC_MACRO_SECURITY_LEVEL_MEDIUM to GC_MACRO_SECURITY_LEVEL_VERYHIGH
+
+        printlog( "Adjust security level" )
+        hSetMacroSecurityAPI( iSecurityLevel )
+
+        printlog( "Load the test file" )
+        hFileOpen( cTestFile )
+
+        printlog( "Deny macro execution or close macros blocked message" )
+        if ( iSecurityLevel = GC_MACRO_SECURITY_LEVEL_MEDIUM ) then
+            hDenyMacroExecution()
+        else
+            kontext "Active"
+            Active.ok()
+        endif
+
+        printlog( "Try to execute macro via macro organizer" )
+        hMacroOrganizerRunMacro( MACRO_NAME )
+
+        printlog( "Probe for warning message (or macro)" )
+        kontext "Active"
+        if ( Active.exists( 2 ) ) then
+            if ( Active.getText() = MACRO_IDENTIFICATION_MESSAGE ) then
+                warnlog( "Macro was executed though macro execution has been denied" )
+                Active.ok()
+            else
+                printlog( "Macro execution blocked - warning is displayed." )
+                Active.ok()
+            endif
+        else
+            warnlog( "No warning message for blocked macro execution" )
+        endif
+
+        ' recover silently, the warnings above should say it all.
+        kontext "Makro"
+        if ( Makro.exists() ) then Makro.cancel()
+
+        printlog( "Close file" )
+        hDestroyDocument()
+
+    next iSecurityLevel
+
+    printlog( "Reset VBA import options to default" )
+    hSetExcelImportModeDefault()
+
+    printlog( "Reset macro security level to default" )
+    hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT )
+
+endcase
+
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc b/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc
index 201dd8eb9862..fa3abab3078f 100755..100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*  
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc b/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc
index 4c6f7c20a076..524c65c31227 100755..100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*  
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba_compat_tools.inc b/testautomation/framework/optional/includes/basic_vba_compat_tools.inc
index 8fc37badb55f..d2f684743405 100755..100644
--- a/testautomation/framework/optional/includes/basic_vba_compat_tools.inc
+++ b/testautomation/framework/optional/includes/basic_vba_compat_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Small helpers for Excel BASIC import modes
 '*
diff --git a/testautomation/framework/optional/includes/configuration.inc b/testautomation/framework/optional/includes/configuration.inc
index 0fce11bddd1b..9e63a4a9ad7e 100755..100644
--- a/testautomation/framework/optional/includes/configuration.inc
+++ b/testautomation/framework/optional/includes/configuration.inc
@@ -44,7 +44,8 @@ sub sToolsCustomizeKeyboardFunction
     for i = 0 to a
         
         if ( i = 7 and gtSysName = "Solaris x86" ) then
-            qaerrorlog( "#i62423# Solaris: Crash when opening new database" )
+            '#i62423# 
+            warnlog( "Solaris: Crash when opening new database" )
         else
             gApplication = aApplication(i)
             tToolsCustomizeKeyboardFunction(lList())
@@ -87,6 +88,7 @@ testcase tToolsCustomizeKeyboardFunction(lList())
     dim i92080 as string
     dim i96322 as string
     dim i100037 as string
+    dim i115370 as string
     
     i60617 = ".uno:ContinueNumbering"
     i43969 = ".uno:MacroOrganizer"
@@ -94,12 +96,13 @@ testcase tToolsCustomizeKeyboardFunction(lList())
     i80850 = ".uno:ToggleFormula.uno:AssignMacro"
     i84982 = ".uno:FontDialogForParagraph"
     i84983 = ".uno:DBNewReportWithPreSelection"
-	i87950 = ".uno:DBMigrateScripts"
-	i87951 = ".uno:DeleteAllNotes.uno:DeleteAuthor.uno:DeleteNote.uno:HideAllNotes.uno:HideAuthor.uno:HideNote"
-	i87952 = ".uno:InsertApplet"
-	i92080 = ".uno:SaveGraphic"
-	i96322 = ".uno:ActivateStyleApply"
-	i100037 = ".uno:AcceptTracedChange, .uno:DeleteComment, .uno:RejectTracedChange, .uno:ReplyNote, .uno:TaskPaneInsertPage, .uno:ValidityReference"
+    i87950 = ".uno:DBMigrateScripts"
+    i87951 = ".uno:DeleteAllNotes.uno:DeleteAuthor.uno:DeleteNote.uno:HideAllNotes.uno:HideAuthor.uno:HideNote"
+    i87952 = ".uno:InsertApplet"
+    i92080 = ".uno:SaveGraphic"
+    i96322 = ".uno:ActivateStyleApply"
+    i100037 = ".uno:AcceptTracedChange, .uno:DeleteComment, .uno:RejectTracedChange, .uno:ReplyNote, .uno:TaskPaneInsertPage, .uno:ValidityReference"
+    i115370 = ".uno:TaskPaneInsertPage"
     
     Call hNewDocument
     sleep 2
@@ -130,53 +133,8 @@ testcase tToolsCustomizeKeyboardFunction(lList())
                     if (((mid(sTemp2,d+1,1)<>" ")AND(abs(asc(mid(sTemp2,d+1,1)))<128)) AND (abs(asc(mid(sTemp2,d-1,1)))<128))then
                         listAppend(lList(),sTemp2)
                         bErrorFound = false
-                        if (inStr(i60617,sTemp2)>0) then
-                            WarnLog "#i60617# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(sTemp2,i64346)>0) then
-                            WarnLog "#i64346# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i43969,sTemp2)>0) then
-                            WarnLog "#i41265# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i80850,sTemp2)>0) then
-                            WarnLog "#i80850# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i84982,sTemp2)>0) then
-                            WarnLog "#i84982# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i84983,sTemp2)>0) then
-                            WarnLog "#i84983# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i87950,sTemp2)>0) then
-                            WarnLog "#i87950# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i87951,sTemp2)>0) then
-                            WarnLog "#i87951# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i87952,sTemp2)>0) then
-                            warnLog "#i87952# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i92080,sTemp2)>0) then
-                            WarnLog "#i92080# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i96322,sTemp2)>0) then
-                            WarnLog "#i96322# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        
-                        if (inStr(i100037,sTemp2)>0) then
-                            WarnLog "#i100037# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
+                        if (inStr(i115370,sTemp2)>0) then
+                            qaerrorlog "#i115370# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
                             bErrorFound = true
                         endif
                         if ( not bErrorFound ) then
diff --git a/testautomation/framework/optional/includes/extras_file_open.inc b/testautomation/framework/optional/includes/extras_file_open.inc
index b4de32acd917..969c45247d58 100755..100644
--- a/testautomation/framework/optional/includes/extras_file_open.inc
+++ b/testautomation/framework/optional/includes/extras_file_open.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Perform standard operations on all samples/templates etc.
 '*
diff --git a/testautomation/framework/optional/includes/extras_labels.inc b/testautomation/framework/optional/includes/extras_labels.inc
index 27e2ae8dced7..2c670ed494a6 100755..100644
--- a/testautomation/framework/optional/includes/extras_labels.inc
+++ b/testautomation/framework/optional/includes/extras_labels.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.co
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : test names of labels
 '*
diff --git a/testautomation/framework/optional/includes/extras_modify_objects.inc b/testautomation/framework/optional/includes/extras_modify_objects.inc
index 59fcf1730d23..75bca49fde18 100755..100644
--- a/testautomation/framework/optional/includes/extras_modify_objects.inc
+++ b/testautomation/framework/optional/includes/extras_modify_objects.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Perform standard operations on all samples/templates etc.
 '*
@@ -39,29 +39,43 @@ private const MAX_FILE_COUNT = 3000 ' the max number of templates or samples
 
 testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
 
+    ' This test loads/saves and reloads every template or sample shipped with
+    ' the product. One of the special challenges of the test is to find out
+    ' which document type a sample/template belongs to as well as to handle
+    ' any possible dialogs the samples/documents may trigger.
+
+    ' iMode = 1 means to open the document (0 = just get its name)
+    ' cCategory may be "SAMPLES" or "TEMPLATES"
+    ' sVER is the fileformat for saving files, typically this is "current"
+
     const CFN = "tModifyObjects::"
-    const RESTART = 15
-    const TEMPLATE_COUNT = 236 ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
-    const SAMPLE_COUNT = 56    ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
 
+    const TEMPLATE_COUNT = 237 ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
+    const SAMPLE_COUNT = 56    ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
 
+    ' Varaibles needed to navigate on the Templates And Samples dialog
     dim iObjectFolder as integer
     dim iObjectFolders as integer
-   
+
+    ' Iterators and number of documents, test values
     dim iObject as integer    ' Iterator
     dim iObjectCount( 100 ) as integer
     dim iObjectSum as integer : iObjectSum = 0
     dim iObjectCountExpected as integer
-   
+
+    ' Where to store the files
     dim sFile as string
-    dim sPath as string
-        sPath = hGetWorkPath()  
+    dim sPath as string : sPath = hGetWorkPath()
 
+    ' Reset counter, if the office becomes unstable you might want to use it.
+    ' See further below on how to enable this feature
     dim iReset as integer : iReset = 0
 
     printlog( "" )
-    
-    select case( lcase( cCategory ))
+
+    ' Find out if we are testing samples or templates, fix the number of items
+    ' allowed for each category
+    select case( lcase( cCategory ) )
     case "templates" : iObjectCountExpected = TEMPLATE_COUNT
     case "samples"   : iObjectCountExpected = SAMPLE_COUNT
     end select
@@ -69,7 +83,11 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
     printlog( "Open Templates and Samples dialog" )
     FileNewFromTemplate
     WaitSlot( 2000 )
+
+    ' This is the icon on the left pane
     hSelectCategory( cCategory )
+
+    ' The number of folders for the category on the middle pane
     iObjectFolders = FileList.getItemCount()
    
     printlog( "Count the items in the templates and samples dialog" )
@@ -93,23 +111,35 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
     endif
    
     Kontext "TemplateAndDocuments"
-    printlog( "Switch from preview to document info" )
+    printlog( "Switch from preview to document info, required to limit load-times" )
+    ' Another good test case would be to enable the preview.
     docinfo.click()
     hCloseDialog( TemplateAndDocuments, "cancel" )
    
     printlog( "" )
     printlog( "Starting to load/save/close/reload/close all Objects" )
     printlog( "" )
-   
+
+    ' Iterate over the folders in the middle pane of the templates and samples
+    ' dialog, open the folders and load the containing files
+    ' If you want to debug the office using this test, get the Object indices
+    ' from the logfiles and change the loops to only load the file in question
+
+    ' These are the folders
     for iObjectFolder = 1 to iObjectFolders
-   
-        for iObject = 1 to iObjectCount( iObjectFolder ) 
-      
+    ' for iObjectFolder = MyFailedFolder to MyFailedFolder
+
+        ' These are the individual files
+        for iObject = 1 to iObjectCount( iObjectFolder )
+        ' for iObject = MyFailedFile to MyFailedFile
+
+            ' Preset gApplication to "Writer", this is the basis
             gApplication = "WRITER"    
             
             printlog( "" )
             printlog( "Folder index = " & iObjectFolder & ", Object index = " & iObject )
-            
+
+            printlog( "Close all files" )
             hFileCloseAll()
 
             ' every now and then the office becomes a little unstable.
@@ -120,14 +150,22 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
             '    iReset = 0
             'endif
           
-            printlog( "Select the item we want to load" )
+            printlog( "Open <FileNewFromTemplate>" )
             FileNewFromTemplate
             WaitSlot( 2000 )
+
+            printlog( "Select category: " & cCategory )
             hSelectCategory( cCategory )
+
+            printlog( "Select a folder, do not print debug info" )
             hSelectFileFolder( iObjectFolder , false )
+
+            printlog( "Select a document by index, iMode = 1 -> Open it" )
             hSelectDocumentObject( iObject , iMode )
             
-            ' treat it like a folder. If it is, skip it. Otherwise perform the test
+            ' In few cases we accidentially work on a folder. So we test for the
+            ' Templates and Samples dialog again, if it is closed we have a
+            ' regular document, otherwise we have a folder which we then skip.
             kontext "TemplateAndDocuments"
             if ( TemplateAndDocuments.exists() ) then
                 if ( not edit.isEnabled() ) then
@@ -138,6 +176,9 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
             else
                 printlog( "Loading file..." )
                 printlog( "Check for Filter Options dialog" )
+
+                ' Yes, hFileWait() knows which dialog is in the way so we can ask it
+                ' directly. The ASCII filter dialog has the number -6
                 if ( hFileWait( false ) = -6 ) then 
                     warnlog( "Load failure: ASCII filter dialog displayed, recovering" )
                     kontext "FilterAuswahl"
@@ -146,27 +187,44 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
                 else
                     printlog( "Build filename; save, reload and delete" )
                     sFile = sPath & cCategory & iObjectFolder & "_" & iObject
+                    printlog( "File is: " & sFile )
+
                     kontext "Navigator"
+                    printlog( "Close Navigator (if present)" )
                     hCloseDialog( Navigator, "close,optional" )
+
+                    printlog( "Save file" )
                     hFileSaveAsKill( sFile )
+
+                    printlog( "Close file" )
                     hDestroyDocument()
+
+                    printlog( "Open file" )
                     hFileOpen( sFile )
+
+                    printlog( "Handle possible dialogs" )
                     hHandleActivesOnLoad( 1 , 2 )
+
                     kontext "Navigator"
+                    printlog( "Close Navigator (if present)" )
                     hCloseDialog( Navigator, "close,optional" )
+
+                    printlog( "Close document" )
                     hDestroyDocument()
+
+                    printlog( "Delete work document" )
                     hDeleteFile( sFile )
-                    printlog( "Test cycle done, going for next object." )
                 endif
             endif
-            
+
             iReset = iReset + 1
       
         next iObject
       
     next iObjectFolder
-    
-    hDestroyDocument()
+
+    printlog( "Close last remaining document(s) and exit test" )
+    hFileCloseAll()
    
 endcase   
    
diff --git a/testautomation/framework/optional/includes/extras_preview.inc b/testautomation/framework/optional/includes/extras_preview.inc
index 0d086c3953c3..cafefd23faf6 100755..100644
--- a/testautomation/framework/optional/includes/extras_preview.inc
+++ b/testautomation/framework/optional/includes/extras_preview.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Perform standard operations on all samples/templates etc.
 '*
diff --git a/testautomation/framework/optional/includes/extras_table_autoformat.inc b/testautomation/framework/optional/includes/extras_table_autoformat.inc
index 7ecb2ce9bf30..f3f5042a2e26 100755..100644
--- a/testautomation/framework/optional/includes/extras_table_autoformat.inc
+++ b/testautomation/framework/optional/includes/extras_table_autoformat.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test the autoformat-feature for tables
 '*
diff --git a/testautomation/framework/optional/includes/f_usage_tracking.inc b/testautomation/framework/optional/includes/f_usage_tracking.inc
index ef20c2a2f1e5..a53f6614ed64 100755..100644
--- a/testautomation/framework/optional/includes/f_usage_tracking.inc
+++ b/testautomation/framework/optional/includes/f_usage_tracking.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Usage tracking
 '*
@@ -88,7 +88,7 @@ testcase tUsageTracking3
         endif
         
         if ( ShowData.isEnabled() ) then
-            warnlog( "#i97340# - Show data button should not be enabled if nothing is logged" )
+            warnlog( "#i116461# - Show data button should not be enabled if nothing is logged" )
     
             ShowData.click()
             
@@ -100,7 +100,7 @@ testcase tUsageTracking3
             
             kontext "Active"
             if ( Active.exists( 2 ) ) then
-                qaerrorlog( "Messagebox not required as control should not be enabled (see #i97340#)" )
+                warnlog( "Messagebox not required as control should not be enabled (see #i116461#)" )
                 Active.ok()
             
                 kontext "TextImport"
diff --git a/testautomation/framework/optional/includes/filedlg_allowed_names.inc b/testautomation/framework/optional/includes/filedlg_allowed_names.inc
index a6d54077f4b5..60c0f6d53481 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_allowed_names.inc
+++ b/testautomation/framework/optional/includes/filedlg_allowed_names.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_autocomplete.inc b/testautomation/framework/optional/includes/filedlg_autocomplete.inc
index bfa424378ef4..e49bdfb98551 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_autocomplete.inc
+++ b/testautomation/framework/optional/includes/filedlg_autocomplete.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Autocompletion feature
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_cjk_files.inc b/testautomation/framework/optional/includes/filedlg_cjk_files.inc
index f9a049c6dbc9..c0777190ddb1 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_cjk_files.inc
+++ b/testautomation/framework/optional/includes/filedlg_cjk_files.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_cjk_folders.inc b/testautomation/framework/optional/includes/filedlg_cjk_folders.inc
new file mode 100644
index 000000000000..9470a9e70190
--- /dev/null
+++ b/testautomation/framework/optional/includes/filedlg_cjk_folders.inc
@@ -0,0 +1,86 @@
+'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 : gregor.hartmann@oracle.com
+'*
+'* short description : check the internal file dialog ( extended tests )
+'*
+'\******************************************************************************
+
+testcase tCJKFolders()
+
+    
+    if ( not hTestLocale() ) then
+        warnlog( "Test requires UTF-8 locale" )
+        goto endsub
+    endif
+    
+    
+    
+    dim cStrangeFolder as string
+    dim cStrangeFile as string
+    dim iCounter as integer ' iterator
+    dim iRandom  as long    ' random number.(needs long for cjk chars)
+    dim brc as boolean
+    
+    printlog( CHR$(13) )
+    printlog( "Check if CJK-files/folders are handled ok" )
+    printlog( CHR$(13) )
+    
+    printlog( "Open a new document" )
+    brc = hCreateDocument()
+    
+    printlog( CHR$(13) + "Names with CJK-chars" )
+    printlog( "" )
+    
+    call randomize()
+    
+    for iCounter = 1 to 3
+        
+        iRandom = int( 19968 + ( 20911 * rnd ) )
+        printlog( " * Using decimal char: " & iRandom )
+        
+        cStrangeFolder = hNameGen_append( iRandom )
+        brc = hCreateDirctoryExpectSuccess( cStrangeFolder )
+        
+        cStrangeFile = hNameGen_append( iRandom )
+        cStrangeFile = convertpath( cStrangeFolder & "\" & cStrangeFile )
+        brc = hSaveLoadDelSuccess( cStrangeFile , TRUE )
+        
+        cStrangeFile = hNameGen_lead( iRandom , true )
+        cStrangeFile = convertpath( cStrangeFolder & "\" & cStrangeFile )
+        brc = hSaveLoadDelSuccess( cStrangeName , true )
+        
+        brc = hDeleteFileExpectSuccess( cStrangeFolder )
+        
+    next iCounter
+    
+    printlog( "Close the document" )
+    brc = hDestroyDocument()
+    
+endcase
+
diff --git a/testautomation/framework/optional/includes/filedlg_document_properties.inc b/testautomation/framework/optional/includes/filedlg_document_properties.inc
index 53917531e275..b350797ff18a 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_document_properties.inc
+++ b/testautomation/framework/optional/includes/filedlg_document_properties.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Access document properties
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_filternames.inc b/testautomation/framework/optional/includes/filedlg_filternames.inc
index 1d0b91e2710d..db09ceaa48ab 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_filternames.inc
+++ b/testautomation/framework/optional/includes/filedlg_filternames.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Verify that all filters are listed in the filter listbox
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders1.inc b/testautomation/framework/optional/includes/filedlg_folders1.inc
index 99cf0831f12c..01bd9467a816 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_folders1.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders2.inc b/testautomation/framework/optional/includes/filedlg_folders2.inc
index e7b6f6e0dcbf..c8e9ac646fec 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_folders2.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders3.inc b/testautomation/framework/optional/includes/filedlg_folders3.inc
index 354c95fbc23c..f0a132c4a494 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_folders3.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders3.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders4.inc b/testautomation/framework/optional/includes/filedlg_folders4.inc
index 6c0bbb881730..4482fba90283 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_folders4.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders4.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders5.inc b/testautomation/framework/optional/includes/filedlg_folders5.inc
index ed3959a6e7e4..b4f4a5690973 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_folders5.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders5.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders6.inc b/testautomation/framework/optional/includes/filedlg_folders6.inc
index e82589bbe1d0..afca7a57aaa3 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_folders6.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders6.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog 
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders7.inc b/testautomation/framework/optional/includes/filedlg_folders7.inc
index df9c399c7253..048ab7f5ca70 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_folders7.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders7.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc b/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc
index b4b538b85cf6..f40b956b9c36 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc
+++ b/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_multiselection.inc b/testautomation/framework/optional/includes/filedlg_multiselection.inc
index 32754ec00553..3d0cf3606260 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_multiselection.inc
+++ b/testautomation/framework/optional/includes/filedlg_multiselection.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Select a huge number of documents and load
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_passwords.inc b/testautomation/framework/optional/includes/filedlg_passwords.inc
index b9442cd2bfbd..a52db4690552 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_passwords.inc
+++ b/testautomation/framework/optional/includes/filedlg_passwords.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : save and load passworded files
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_rename.inc b/testautomation/framework/optional/includes/filedlg_rename.inc
index 513a652b8f36..c5f983db8c95 100644
--- a/testautomation/framework/optional/includes/filedlg_rename.inc
+++ b/testautomation/framework/optional/includes/filedlg_rename.inc
@@ -26,7 +26,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : Joerg.Skottke@Sun.Com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Remane files dialog
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
index 7758fbe55783..af6e67b53ce7 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
+++ b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc
index 48ed1a59e4a3..ec4119ca8518 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc
+++ b/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_tools.inc b/testautomation/framework/optional/includes/filedlg_tools.inc
index b04fdc3f92ec..06c86bce75aa 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_tools.inc
+++ b/testautomation/framework/optional/includes/filedlg_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_triggers.inc b/testautomation/framework/optional/includes/filedlg_triggers.inc
index 1e39d2900895..68c715326769 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_triggers.inc
+++ b/testautomation/framework/optional/includes/filedlg_triggers.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Alternative ways to open file-dialogs / slot availablilty
 '*
diff --git a/testautomation/framework/optional/includes/fontworkgallery.inc b/testautomation/framework/optional/includes/fontworkgallery.inc
index c83ce1fb5740..c83ce1fb5740 100755..100644
--- a/testautomation/framework/optional/includes/fontworkgallery.inc
+++ b/testautomation/framework/optional/includes/fontworkgallery.inc
diff --git a/testautomation/framework/optional/includes/help_bookmarks.inc b/testautomation/framework/optional/includes/help_bookmarks.inc
index 04a16951c0a9..22cd3d0dde03 100755..100644
--- a/testautomation/framework/optional/includes/help_bookmarks.inc
+++ b/testautomation/framework/optional/includes/help_bookmarks.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Bookmarks in the help browser
 '*
diff --git a/testautomation/framework/optional/includes/help_compare_applications.inc b/testautomation/framework/optional/includes/help_compare_applications.inc
index 3028c41ecedf..ca1874d6a63d 100755..100644
--- a/testautomation/framework/optional/includes/help_compare_applications.inc
+++ b/testautomation/framework/optional/includes/help_compare_applications.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : 
 '*
diff --git a/testautomation/framework/optional/includes/help_compare_content.inc b/testautomation/framework/optional/includes/help_compare_content.inc
index 73c11940e0dc..a65e27b27d04 100755..100644
--- a/testautomation/framework/optional/includes/help_compare_content.inc
+++ b/testautomation/framework/optional/includes/help_compare_content.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : 
 '*
diff --git a/testautomation/framework/optional/includes/help_compare_topics.inc b/testautomation/framework/optional/includes/help_compare_topics.inc
index ef060eb18275..a067e814f3ab 100755..100644
--- a/testautomation/framework/optional/includes/help_compare_topics.inc
+++ b/testautomation/framework/optional/includes/help_compare_topics.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : 
 '*
diff --git a/testautomation/framework/optional/includes/help_search.inc b/testautomation/framework/optional/includes/help_search.inc
index 92243b538c4f..e485b267da9c 100755..100644
--- a/testautomation/framework/optional/includes/help_search.inc
+++ b/testautomation/framework/optional/includes/help_search.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Search for a string, apply restrictions, verify
 '*
diff --git a/testautomation/framework/optional/includes/help_view_topics.inc b/testautomation/framework/optional/includes/help_view_topics.inc
index b14c5d5a8511..6c7cd35bb510 100755..100644
--- a/testautomation/framework/optional/includes/help_view_topics.inc
+++ b/testautomation/framework/optional/includes/help_view_topics.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Display each help topic
 '*
diff --git a/testautomation/framework/optional/includes/loadsave_files.inc b/testautomation/framework/optional/includes/loadsave_files.inc
index a9eac8164c22..a9eac8164c22 100755..100644
--- a/testautomation/framework/optional/includes/loadsave_files.inc
+++ b/testautomation/framework/optional/includes/loadsave_files.inc
diff --git a/testautomation/framework/optional/includes/loadsave_new.inc b/testautomation/framework/optional/includes/loadsave_new.inc
index 02e734382fa2..02e734382fa2 100755..100644
--- a/testautomation/framework/optional/includes/loadsave_new.inc
+++ b/testautomation/framework/optional/includes/loadsave_new.inc
diff --git a/testautomation/framework/optional/includes/menuentries.inc b/testautomation/framework/optional/includes/menuentries.inc
index f2006915c8b1..f2006915c8b1 100755..100644
--- a/testautomation/framework/optional/includes/menuentries.inc
+++ b/testautomation/framework/optional/includes/menuentries.inc
diff --git a/testautomation/framework/optional/includes/ole_1.inc b/testautomation/framework/optional/includes/ole_1.inc
index de7efa3bae8d..de7efa3bae8d 100755..100644
--- a/testautomation/framework/optional/includes/ole_1.inc
+++ b/testautomation/framework/optional/includes/ole_1.inc
diff --git a/testautomation/framework/optional/includes/ole_2.inc b/testautomation/framework/optional/includes/ole_2.inc
index a45c885428fb..a45c885428fb 100755..100644
--- a/testautomation/framework/optional/includes/ole_2.inc
+++ b/testautomation/framework/optional/includes/ole_2.inc
diff --git a/testautomation/framework/optional/includes/ole_3.inc b/testautomation/framework/optional/includes/ole_3.inc
index 0636bfacb576..0636bfacb576 100755..100644
--- a/testautomation/framework/optional/includes/ole_3.inc
+++ b/testautomation/framework/optional/includes/ole_3.inc
diff --git a/testautomation/framework/optional/includes/ole_tools.inc b/testautomation/framework/optional/includes/ole_tools.inc
index fdcfb6c62166..fdcfb6c62166 100755..100644
--- a/testautomation/framework/optional/includes/ole_tools.inc
+++ b/testautomation/framework/optional/includes/ole_tools.inc
diff --git a/testautomation/framework/optional/includes/options_loadsave_general.inc b/testautomation/framework/optional/includes/options_loadsave_general.inc
index 84c41e906df6..69e08f7bef20 100755..100644
--- a/testautomation/framework/optional/includes/options_loadsave_general.inc
+++ b/testautomation/framework/optional/includes/options_loadsave_general.inc
@@ -63,6 +63,7 @@ testcase tLoadSaveGeneral
             printlog( "    -  " & DokumentTyp.getSelText)
         next i
     endif
+    
     for i=1 to AppCount
         Dokumenttyp.Select(i)
         lsSave(2+i)          = Dokumenttyp.GetSelText
@@ -70,18 +71,55 @@ testcase tLoadSaveGeneral
     next i
 
     printlog " - invert/change settings"
-    if lbSave(13) then BenutzerspezifischeEinstellungen.UnCheck else BenutzerspezifischeEinstellungen.Check
-    if lbSave(1) then DokumenteigenschaftenBearbeiten.Uncheck else DokumenteigenschaftenBearbeiten.Check
-    if lbSave(2) then Sicherungskopie.Uncheck else Sicherungskopie.Check
-    if lbSave(3) then AutomatischSpeichern.Uncheck else AutomatischSpeichern.Check
+    if lbSave(13) then
+        BenutzerspezifischeEinstellungen.UnCheck
+    else
+        BenutzerspezifischeEinstellungen.Check
+    endif
+
+    if lbSave(1) then
+        DokumenteigenschaftenBearbeiten.Uncheck
+    else
+        DokumenteigenschaftenBearbeiten.Check
+    endif
+
+    if lbSave(2) then
+        Sicherungskopie.Uncheck
+    else
+        Sicherungskopie.Check
+    endif
+
+    if lbSave(3) then
+        AutomatischSpeichern.Uncheck
+    else
+        AutomatischSpeichern.Check
+    endif
+
     if AutomatischSpeichern.IsChecked then
         lsSave(1) = Minuten.GetText
         Minuten.SetText "23"
     endif
-    if lbSave(10) then NoPrettyPrinting.Uncheck else NoPrettyPrinting.Check
-    if lbSave(11) then URLimDateisystem.Uncheck else URLimDateisystem.Check
-    if lbSave(12) then URLimInternet.Uncheck else URLimInternet.Check
+
+    if lbSave(10) then
+        NoPrettyPrinting.Uncheck
+    else
+        NoPrettyPrinting.Check
+    endif
+
+    if lbSave(11) then
+        URLimDateisystem.Uncheck
+    else
+        URLimDateisystem.Check
+    endif
+
+    if lbSave(12) then
+        URLimInternet.Uncheck
+    else
+        URLimInternet.Check
+    endif
+
     printlog( "Setting filters for documenttypes: Select third item from every list" )
+
     for i=1 to AppCount
         Dokumenttyp.Select(i)
         Filter.Select(3)
@@ -90,8 +128,7 @@ testcase tLoadSaveGeneral
 
     printlog " - close options-dlg with OK"
     kontext "ExtrasOptionenDlg"
-    ExtrasOptionenDlg.OK
-    sleep(3)
+    hCloseDialog( ExtrasOptionenDlg, "ok" )
 
     printlog " - exit/restart StarOffice"
     ExitRestartTheOffice
@@ -103,15 +140,19 @@ testcase tLoadSaveGeneral
     if BenutzerspezifischeEinstellungen.IsChecked = lbSave ( 13 ) then
         Warnlog "'Load user setting with document' => changes not saved"
     endif
+
     if DokumenteigenschaftenBearbeiten.IsChecked = lbSave ( 1 ) then
         Warnlog "'Edit document properties before saving' => changes not saved"
     endif
+
     if Sicherungskopie.IsChecked = lbSave ( 2 ) then
         Warnlog "'Create backup copy' => changes not saved"
     endif
+
     if AutomatischSpeichern.IsChecked = lbSave ( 3 ) then
         printlog "AutoSave => changes not saved"
     endif
+
     if AutomatischSpeichern.IsChecked then
         if Minuten.GetText <> "23" then
             Warnlog "Minutes for AutoSave => changes not saved"
@@ -120,20 +161,23 @@ testcase tLoadSaveGeneral
     if NoPrettyPrinting.IsChecked = lbSave ( 10 ) then
         Warnlog "no pretty printing => changes not saved"
     endif
+
     if URLimDateisystem.IsChecked = lbSave ( 11 ) then
         Warnlog "URL: File system => changes not saved"
     endif
+
     if URLimInternet.IsChecked = lbSave ( 12 ) then
         Warnlog "URL: Internet => changes not saved"
     endif
-    
+
     printlog( "Verifying filters for documenttypes: Select third item from every list" )
     for i=1 to AppCount
         Dokumenttyp.Select(i)
-      	printlog( "Doctype: " & Dokumenttyp.getSelText() & " has filter: " & Filter.getSelText() )
-        
+        printlog( "Doctype: " & Dokumenttyp.getSelText() & " has filter: " & Filter.getSelText() )
+
         if Filter.GetSelIndex <> 3 then
-            warnlog( "#i79150# some options in Tools/Options->Load/Save->General are not saved" )
+            '#i79150# 
+            warnlog( "Some options in Tools/Options->Load/Save->General are not saved" )
         endif
     next i
 
@@ -146,6 +190,7 @@ testcase tLoadSaveGeneral
     NoPrettyPrinting.Uncheck
     URLimDateisystem.Uncheck
     URLimInternet.Uncheck
+
     for i=1 to AppCount
         Dokumenttyp.Select(i)
         Filter.Select(4)
@@ -154,8 +199,7 @@ testcase tLoadSaveGeneral
     printlog " - close options-dlg with OK"
 
     kontext "extrasoptionendlg"
-    ExtrasOptionenDlg.OK
-    Sleep (1)
+    hCloseDialog( ExtrasOptionenDlg, "ok" )
 
     printlog "    - react on messageboxes for loosing settings after changing default-filters"
     kontext "FilterWarning"
@@ -166,7 +210,7 @@ testcase tLoadSaveGeneral
             i = AppCount + 1
         endif
     next i
-    Sleep (3)
+    WaitSlot()
 
     printlog " - check second changes"
     ToolsOptions
@@ -175,27 +219,35 @@ testcase tLoadSaveGeneral
     if BenutzerspezifischeEinstellungen.IsChecked <> FALSE then
         Warnlog "'Load user setting with document' => changes not saved"
     endif
+
     if DokumenteigenschaftenBearbeiten.IsChecked <> TRUE then
         Warnlog "'Edit document properties before saving' => changes not saved"
     endif
+
     if Sicherungskopie.IsChecked <> FALSE then
         Warnlog "'Create backup copy' => changes not saved"
     endif
+
     if AutomatischSpeichern.IsChecked <> TRUE then
         Warnlog "AutoSave => changes not saved"
     endif
+
     if Minuten.GetText <> "1" then
         Warnlog "Minutes for AutoSave => changes not saved"
     endif
+
     if NoPrettyPrinting.IsChecked <> FALSE then
         Warnlog "no pretty printing => changes not saved"
     endif
+
     if URLimDateisystem.IsChecked <> FALSE then
         Warnlog "URL: File system => changes not saved"
     endif
+
     if URLimInternet.IsChecked <> FALSE  then
         Warnlog "URL: Internet => changes not saved"
     endif
+
     for i=1 to AppCount
         Dokumenttyp.Select(i)
         if Filter.GetSelIndex <> 4 then
@@ -207,26 +259,33 @@ testcase tLoadSaveGeneral
     if lbSave ( 13 ) = FALSE then
         BenutzerspezifischeEinstellungen.UnCheck else BenutzerspezifischeEinstellungen.Check
     endif
+
     if lbSave ( 1  ) = FALSE then
         DokumenteigenschaftenBearbeiten.UnCheck else DokumenteigenschaftenBearbeiten.Check
     endif
     if lbSave ( 2  ) = FALSE then
         Sicherungskopie.Uncheck else Sicherungskopie.Check
     endif
+
     AutomatischSpeichern.Check
     Minuten.SetText lsSave ( 1 )
+
     if lbSave ( 3  ) = FALSE then
         AutomatischSpeichern.Uncheck else AutomatischSpeichern.Check
     endif
+
     if lbSave ( 10 ) = FALSE then
         NoPrettyPrinting.Uncheck else NoPrettyPrinting.Check
     endif
+
     if lbSave ( 11 ) = FALSE then
         URLimDateisystem.UnCheck else URLimDateisystem.Check
     endif
+
     if lbSave ( 12 ) = FALSE then
         URLimInternet.UnCheck else URLimInternet.Check
     endif
+
     for i=1 to AppCount
         Dokumenttyp.Select(i)
         if Dokumenttyp.GetSelText <> lsSave ( 2 + i ) then
@@ -236,8 +295,8 @@ testcase tLoadSaveGeneral
     next i
 
     kontext "ExtrasOptionenDlg"
-    ExtrasOptionenDlg.OK
-    Sleep (3)
+    hCloseDialog( ExtrasOptionenDlg, "ok" )
+
 
     printlog " - check settings"
     ToolsOptions
@@ -246,29 +305,37 @@ testcase tLoadSaveGeneral
     if BenutzerspezifischeEinstellungen.IsChecked <> lbSave ( 13 ) then
         Warnlog "'Load user setting with document' => changes not saved"
     endif
+
     if DokumenteigenschaftenBearbeiten.IsChecked <> lbSave ( 1 ) then
         Warnlog "'Edit document properties before saving' => changes not saved"
     endif
+
     if Sicherungskopie.IsChecked <> lbSave ( 2 ) then
         Warnlog "'Create backup copy' => changes not saved"
     endif
+
     if AutomatischSpeichern.IsChecked <> lbSave ( 3 ) then
         Warnlog "AutoSave => changes not saved"
     endif
+
     if AutomatischSpeichern.IsChecked then
         if Minuten.GetText <> lsSave( 1 ) then
             Warnlog "Minutes for AutoSave => changes not saved"
         endif
     endif
+
     if NoPrettyPrinting.IsChecked <> lbSave ( 10 ) then
         Warnlog "no pretty printing => changes not saved"
     endif
+
     if URLimDateisystem.IsChecked <> lbSave ( 11 ) then
         Warnlog "URL: File system => changes not saved"
     endif
+
     if URLimInternet.IsChecked <> lbSave ( 12 ) then
         Warnlog "URL: Internet => changes not saved"
     endif
+
     for i=1 to AppCount
         Dokumenttyp.Select(i)
         if Dokumenttyp.GetSelText <> lsSave ( 2 + i ) then
@@ -280,5 +347,6 @@ testcase tLoadSaveGeneral
     next i
 
     kontext "extrasoptionendlg"
-    ExtrasOptionenDlg.OK
+    hCloseDialog( ExtrasOptionenDlg, "ok" )
+
 endcase
diff --git a/testautomation/framework/optional/includes/options_loadsave_html.inc b/testautomation/framework/optional/includes/options_loadsave_html.inc
index d1b7790f539b..fa65c21a8368 100755..100644
--- a/testautomation/framework/optional/includes/options_loadsave_html.inc
+++ b/testautomation/framework/optional/includes/options_loadsave_html.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test the Load/Save HTML compatibility page
 '*
diff --git a/testautomation/framework/optional/includes/options_loadsave_msoffice.inc b/testautomation/framework/optional/includes/options_loadsave_msoffice.inc
index c04a110e7ce5..9a9e258e3e8b 100755..100644
--- a/testautomation/framework/optional/includes/options_loadsave_msoffice.inc
+++ b/testautomation/framework/optional/includes/options_loadsave_msoffice.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test Load/Save MS-Office settings page
 '*
diff --git a/testautomation/framework/optional/includes/options_loadsave_vba.inc b/testautomation/framework/optional/includes/options_loadsave_vba.inc
index be367449553b..e227b0d9dc77 100755..100644
--- a/testautomation/framework/optional/includes/options_loadsave_vba.inc
+++ b/testautomation/framework/optional/includes/options_loadsave_vba.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test VBA settings-page
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_accessibility.inc b/testautomation/framework/optional/includes/options_ooo_accessibility.inc
index 6e553bd336a3..6e553bd336a3 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_accessibility.inc
+++ b/testautomation/framework/optional/includes/options_ooo_accessibility.inc
diff --git a/testautomation/framework/optional/includes/options_ooo_appearance.inc b/testautomation/framework/optional/includes/options_ooo_appearance.inc
index 72b016b72582..72b016b72582 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_appearance.inc
+++ b/testautomation/framework/optional/includes/options_ooo_appearance.inc
diff --git a/testautomation/framework/optional/includes/options_ooo_colors.inc b/testautomation/framework/optional/includes/options_ooo_colors.inc
index 6d1db18179c2..92489ecb15fc 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_colors.inc
+++ b/testautomation/framework/optional/includes/options_ooo_colors.inc
@@ -40,8 +40,8 @@ testcase tOOoColors
     dim currentColor(4) as String
     dim chColor(4)      as String
     
-    const DEFAULT_COLOR_COUNT = 103
-    const CHANGED_COLOR_COUNT = 104
+    const DEFAULT_COLOR_COUNT = 100
+    const CHANGED_COLOR_COUNT = DEFAULT_COLOR_COUNT +1
     const USER_COLOR = "TT-Test-Color"
     
     myColor(1) = USER_COLOR
@@ -66,10 +66,8 @@ testcase tOOoColors
         printlog( "Check the number of currently registered colors - cancel test on error" )
         Kontext "TabFarben"
         if ( Farbe.GetItemCount() <> DEFAULT_COLOR_COUNT ) then
-            warnlog( "The number of colors has changed, stopping test" )
-            printlog( "Expected: " & DEFAULT_COLOR_COUNT )
-            printlog( "Found...: " & Farbe.getItemCount() )
-            printlog( "Close the Tools/Options dialog with OK" )
+            warnlog "The number of colors has changed, stopping test; Expected: " & DEFAULT_COLOR_COUNT & "; Found...: " & Farbe.getItemCount() 
+            printlog "Close the Tools/Options dialog with OK" 
             Kontext "ExtrasOptionenDlg"
             ExtrasOptionenDlg.OK
             WaitSlot( 2000 )
@@ -106,8 +104,7 @@ testcase tOOoColors
 
         printlog( "Close the Tools/Options dialog with OK" )
         Kontext "ExtrasOptionenDlg"
-        ExtrasOptionenDlg.OK
-        WaitSlot( 2000 )
+        hCloseDialog( ExtrasOptionenDlg, "ok" )
     else
         warnlog( "Tools/Options dialog not open" )
     endif
@@ -163,9 +160,7 @@ testcase tOOoColors
         
         printlog( "Close options dialog with OK" )
         Kontext "ExtrasOptionenDlg"
-        ExtrasOptionenDlg.OK
-        WaitSlot( 2000 )
-        
+        hCloseDialog( ExtrasOptionenDlg, "ok" )
     else
         warnlog( "Tools/Options dialog not open" )
     endif
@@ -196,9 +191,7 @@ testcase tOOoColors
 
         printlog( "Close options dialog with OK" )
         Kontext "ExtrasOptionenDlg"
-        ExtrasOptionenDlg.OK
-        WaitSlot( 2000 )
-        
+        hCloseDialog( ExtrasOptionenDlg, "ok" )
     else
         warnlog( "Tools/Options dialog not open" )
     endif
diff --git a/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc b/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc
index ccf22af0680e..ccf22af0680e 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc
+++ b/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc
diff --git a/testautomation/framework/optional/includes/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc
index c973feade8ae..2051fcefbf3d 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_general.inc
+++ b/testautomation/framework/optional/includes/options_ooo_general.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : 1. test for general group userdata
 '*
@@ -33,99 +33,167 @@
 
 testcase tOOoGeneral
 
-   dim lsSave (4) as String
-   dim lbSave (3) as Boolean
-
-   hNewDocument
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-
-   printlog " - save old data"
-   lsSave ( 1 ) = Zweistellig.GetText
-   lbSave ( 1 ) = Aktivieren.IsChecked
-   Aktivieren.Check
-   if gPlatgroup = "w95" then
-      lbSave (2) = StarOfficeDialogeBenutzen.IsChecked
-   end if
-   lbSave ( 3 ) = DruckenStatus.IsChecked
-   lsSave ( 3 ) = StyleSheet.GetSelText
-
-   printlog " - invert/change data"
-   Zweistellig.SetText "1950"
-   Zuruecksetzen.Click
-   if gPlatgroup = "w95" then
-      if lbSave (2) = TRUE then StarOfficeDialogeBenutzen.Uncheck else StarOfficeDialogeBenutzen.Check
-   end if
-   If lbSave ( 3 ) = TRUE then DruckenStatus.Uncheck else DruckenStatus.Check
-   StyleSheet.Select 3
-
-   Kontext "ExtrasOptionenDlg"
-
-   hCloseDialog( ExtrasOptionenDlg, "ok" )
-   hCloseDocument
-
-   printlog " - exit/restart StarOffice"
-   ExitRestartTheOffice
-
-   printlog " - check data"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-
-   if Zweistellig.GetText <> "1950" then Warnlog "Year ( 2 digits ) => changes not saved: '" + Zweistellig.GetText +"' #i29810"
-   if Aktivieren.IsChecked <> TRUE then Warnlog "Enable HelpAgent => changes not saved"
-   Zuruecksetzen.Click
-   if gPlatgroup = "w95" then
-      if StarOfficeDialogeBenutzen.IsChecked = lbSave (2) then Warnlog "Use StarOffice dialogs => changes not saved!"
-   end if
-   If DruckenStatus.IsChecked = lbSave ( 3 ) then Warnlog "Printing sets 'Document modified' status => changes not saved!"
-
-   printlog " - 2. change data"
-   Zweistellig.SetText "1800"
-   DruckenStatus.UnCheck
-
-   Kontext "ExtrasOptionenDlg"
-   hCloseDialog( ExtrasOptionenDlg, "ok" )
-
-   printlog " - check data"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-
-   if Zweistellig.GetText <> "1800" then Warnlog "Year ( 2 digits ) => changes not saved : '" + Zweistellig.GetText +"'"
-   If DruckenStatus.IsChecked <> FALSE then Warnlog "Printing sets 'Document modified' status => changes not saved!"
-   if StyleSheet.GetSelIndex <> 3 then Warnlog "Style sheet for StarOffice Help => changes not saved!"
-
-   printlog " - reset to saved data"
-   Zweistellig.SetText lsSave ( 1 )
-   Aktivieren.Check
-   Zuruecksetzen.Click
-   if lbSave (1) = TRUE then Aktivieren.Check else Aktivieren.Uncheck
-   if gPlatgroup = "w95" then
-      if lbSave (2) = TRUE then StarOfficeDialogeBenutzen.Check else StarOfficeDialogeBenutzen.UnCheck
-   end if
-   If lbSave(3)= TRUE then DruckenStatus.Check else DruckenStatus.UnCheck
-   StyleSheet.Select lsSave(3)
-
-   Kontext "ExtrasOptionenDlg"
-   hCloseDialog( ExtrasOptionenDlg, "ok" )
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-
-   printlog " - check the reset data"
-   if Zweistellig.GetText <> lsSave ( 1 ) then Warnlog "Year ( 2 digits ) => changes not saved"
-   if Aktivieren.IsChecked <> lbSave (1) then Warnlog "Enable HelpAgent => changes not saved"
-   Aktivieren.Check
-   Zuruecksetzen.Click
-   if lbSave (1) = TRUE then Aktivieren.Check else Aktivieren.Uncheck
-   if gPlatgroup = "w95" then
-      if StarOfficeDialogeBenutzen.IsChecked <> lbSave (2) then Warnlog "Use StarOffice dialogs => changes not saved!"
-   end if
-   If DruckenStatus.IsChecked <> lbSave(3) then Warnlog "Printing sets 'Document modified' status => changes not saved!"
-   if StyleSheet.GetSelText <> lsSave (3) then Warnlog "Style sheet for StarOffice Help => changes not saved!"
-
-   Kontext "ExtrasOptionenDlg"
-   hCloseDialog( ExtrasOptionenDlg, "ok" )
+    dim lsSave (4) as String
+    dim lbSave (3) as Boolean
+
+    hNewDocument
+
+    ToolsOptions
+    hToolsOptions ( "StarOffice", "General" )
+
+    printlog " - save old data"
+    lsSave ( 1 ) = Zweistellig.GetText
+    lbSave ( 1 ) = Aktivieren.IsChecked
+    Aktivieren.Check
+
+    if gPlatgroup = "w95" then
+        lbSave (2) = StarOfficeDialogeBenutzen.IsChecked
+    endif
+
+    lbSave ( 3 ) = DruckenStatus.IsChecked
+    lsSave ( 3 ) = StyleSheet.GetSelText
+
+    printlog " - invert/change data"
+    Zweistellig.SetText "1950"
+    Zuruecksetzen.Click
+
+    if gPlatgroup = "w95" then
+        if lbSave (2) then
+            StarOfficeDialogeBenutzen.Uncheck
+        else
+            StarOfficeDialogeBenutzen.Check
+        endif
+    endif
+
+    If lbSave ( 3 ) then
+        DruckenStatus.Uncheck
+    else
+        DruckenStatus.Check
+    endif
+    
+    StyleSheet.Select 3
+
+    Kontext "ExtrasOptionenDlg"
+    hCloseDialog( ExtrasOptionenDlg, "ok" )
+    hCloseDocument
+
+    printlog " - exit/restart StarOffice"
+    ExitRestartTheOffice
+
+    printlog " - check data"
+    ToolsOptions
+    hToolsOptions ( "StarOffice", "General" )
+
+    if Zweistellig.GetText <> "1950" then
+        '#i29810# 
+        Warnlog "Year ( 2 digits ) => changes not saved: " + Zweistellig.GetText
+    endif
+
+    if not Aktivieren.IsChecked then
+        Warnlog "Enable HelpAgent => changes not saved"
+    endif
+
+    Zuruecksetzen.Click
+
+    if gPlatgroup = "w95" then
+        if StarOfficeDialogeBenutzen.IsChecked = lbSave (2) then
+            Warnlog "Use StarOffice dialogs => changes not saved!"
+        endif
+    endif
+
+    If DruckenStatus.IsChecked = lbSave ( 3 ) then
+        Warnlog "Printing sets 'Document modified' status => changes not saved!"
+    endif
+
+    printlog " - 2. change data"
+    Zweistellig.SetText "1800"
+    DruckenStatus.UnCheck
+
+    Kontext "ExtrasOptionenDlg"
+    hCloseDialog( ExtrasOptionenDlg, "ok" )
+
+    printlog " - check data"
+    ToolsOptions
+    hToolsOptions ( "StarOffice", "General" )
+
+    if ( Zweistellig.GetText <> "1800" ) then
+        '#i29810# 
+        Warnlog( "Year ( 2 digits ) => changes not saved : " & Zweistellig.GetText() )
+    endif
+
+    If DruckenStatus.IsChecked  then
+        Warnlog "Printing sets 'Document modified' status => changes not saved!"
+    endif
+
+    if StyleSheet.GetSelIndex <> 3 then
+        Warnlog "Style sheet for StarOffice Help => changes not saved!"
+    endif
+
+    printlog " - reset to saved data"
+    Zweistellig.SetText lsSave ( 1 )
+    Aktivieren.Check
+    Zuruecksetzen.Click
+
+    if lbSave (1) then
+        Aktivieren.Check
+    else
+        Aktivieren.Uncheck
+    endif
+
+    if gPlatgroup = "w95" then
+        if lbSave (2) then
+            StarOfficeDialogeBenutzen.Check
+        else
+            StarOfficeDialogeBenutzen.UnCheck
+        endif
+    endif
+
+    If lbSave(3) then
+        DruckenStatus.Check
+    else
+        DruckenStatus.UnCheck
+    endif
+
+    StyleSheet.Select lsSave(3)
+
+    Kontext "ExtrasOptionenDlg"
+    hCloseDialog( ExtrasOptionenDlg, "ok" )
+
+    ToolsOptions
+    hToolsOptions ( "StarOffice", "General" )
+
+    printlog " - check the reset data"
+    if Zweistellig.GetText <> lsSave ( 1 ) then
+        Warnlog "Year ( 2 digits ) => changes not saved"
+    endif
+
+    if Aktivieren.IsChecked <> lbSave (1) then
+        Warnlog "Enable HelpAgent => changes not saved"
+    endif
+
+    Aktivieren.Check
+    Zuruecksetzen.Click
+
+    if lbSave (1) then
+        Aktivieren.Check else Aktivieren.Uncheck
+    endif
+
+    if gPlatgroup = "w95" then
+        if StarOfficeDialogeBenutzen.IsChecked <> lbSave (2) then
+            Warnlog "Use StarOffice dialogs => changes not saved!"
+        endif
+    endif
+
+    If DruckenStatus.IsChecked <> lbSave(3) then
+        Warnlog "Printing sets 'Document modified' status => changes not saved!"
+    endif
+
+    if StyleSheet.GetSelText <> lsSave (3) then
+        Warnlog "Style sheet for StarOffice Help => changes not saved!"
+    endif
+
+    Kontext "ExtrasOptionenDlg"
+    hCloseDialog( ExtrasOptionenDlg, "ok" )
 
 endcase
 
diff --git a/testautomation/framework/optional/includes/options_ooo_java.inc b/testautomation/framework/optional/includes/options_ooo_java.inc
index 4b3c1b9dd51d..4b3c1b9dd51d 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_java.inc
+++ b/testautomation/framework/optional/includes/options_ooo_java.inc
diff --git a/testautomation/framework/optional/includes/options_ooo_memory.inc b/testautomation/framework/optional/includes/options_ooo_memory.inc
index 6c2038556af4..357e6e5a2f16 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_memory.inc
+++ b/testautomation/framework/optional/includes/options_ooo_memory.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : 1. test for general group userdata ... view)
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_paths.inc b/testautomation/framework/optional/includes/options_ooo_paths.inc
index 85c797665a1e..85c797665a1e 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_paths.inc
+++ b/testautomation/framework/optional/includes/options_ooo_paths.inc
diff --git a/testautomation/framework/optional/includes/options_ooo_print.inc b/testautomation/framework/optional/includes/options_ooo_print.inc
index 35e83eb0d5f2..35e83eb0d5f2 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_print.inc
+++ b/testautomation/framework/optional/includes/options_ooo_print.inc
diff --git a/testautomation/framework/optional/includes/options_ooo_security.inc b/testautomation/framework/optional/includes/options_ooo_security.inc
index 5c839a249af5..5c839a249af5 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_security.inc
+++ b/testautomation/framework/optional/includes/options_ooo_security.inc
diff --git a/testautomation/framework/optional/includes/options_ooo_userdata.inc b/testautomation/framework/optional/includes/options_ooo_userdata.inc
index c1adc7709e70..c1adc7709e70 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_userdata.inc
+++ b/testautomation/framework/optional/includes/options_ooo_userdata.inc
diff --git a/testautomation/framework/optional/includes/options_ooo_view.inc b/testautomation/framework/optional/includes/options_ooo_view.inc
index 52130dcd09d4..52130dcd09d4 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_view.inc
+++ b/testautomation/framework/optional/includes/options_ooo_view.inc
diff --git a/testautomation/framework/optional/includes/scripting_organizers.inc b/testautomation/framework/optional/includes/scripting_organizers.inc
index c3da1313da9c..5f804a951ea2 100755..100644
--- a/testautomation/framework/optional/includes/scripting_organizers.inc
+++ b/testautomation/framework/optional/includes/scripting_organizers.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test scripting-organizers / document-attached scripts
 '*
diff --git a/testautomation/framework/optional/includes/security_broken_signature.inc b/testautomation/framework/optional/includes/security_broken_signature.inc
index 1cce0f33af3d..4e64d2073b7c 100755..100644
--- a/testautomation/framework/optional/includes/security_broken_signature.inc
+++ b/testautomation/framework/optional/includes/security_broken_signature.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load documents containing hidden BASIC scripts
 '*
diff --git a/testautomation/framework/optional/includes/security_certification_dialogs.inc b/testautomation/framework/optional/includes/security_certification_dialogs.inc
index c367285956ae..60cb3cfaf657 100755..100644
--- a/testautomation/framework/optional/includes/security_certification_dialogs.inc
+++ b/testautomation/framework/optional/includes/security_certification_dialogs.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Walk through a number of dialogs related to digital signatures
 '*
diff --git a/testautomation/framework/optional/includes/security_certified_docs.inc b/testautomation/framework/optional/includes/security_certified_docs.inc
index b00e5460e3fb..71e899609b4b 100755..100644
--- a/testautomation/framework/optional/includes/security_certified_docs.inc
+++ b/testautomation/framework/optional/includes/security_certified_docs.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.co
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load certified documents and verify the certificate
 '*
diff --git a/testautomation/framework/optional/includes/security_evilmacro1.inc b/testautomation/framework/optional/includes/security_evilmacro1.inc
index 9927f1652cb3..0de48f87824e 100755..100644
--- a/testautomation/framework/optional/includes/security_evilmacro1.inc
+++ b/testautomation/framework/optional/includes/security_evilmacro1.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load documents containing hidden BASIC scripts
 '*
diff --git a/testautomation/framework/optional/includes/security_evilmacro2.inc b/testautomation/framework/optional/includes/security_evilmacro2.inc
index 0c687976fba7..6b8b29903f72 100755..100644
--- a/testautomation/framework/optional/includes/security_evilmacro2.inc
+++ b/testautomation/framework/optional/includes/security_evilmacro2.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load documents containing hidden BASIC scripts
 '*
diff --git a/testautomation/framework/optional/includes/security_evilmacro3.inc b/testautomation/framework/optional/includes/security_evilmacro3.inc
index c891163ef3e2..a4613be4b678 100755..100644
--- a/testautomation/framework/optional/includes/security_evilmacro3.inc
+++ b/testautomation/framework/optional/includes/security_evilmacro3.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load documents containing hidden BASIC scripts
 '*
diff --git a/testautomation/framework/optional/includes/security_incorrect_password.inc b/testautomation/framework/optional/includes/security_incorrect_password.inc
index 8e6eb2deffee..74be4748b55e 100755..100644
--- a/testautomation/framework/optional/includes/security_incorrect_password.inc
+++ b/testautomation/framework/optional/includes/security_incorrect_password.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Password protect files
 '*
@@ -66,8 +66,8 @@ testcase tIncorrectPassword( filetypeID as string )
         printlog( "Check the password checkbox" )
         Passwort.check()
 
-        printlog( "Name the file as " & workpath & WORKFILE )
-        Dateiname.settext( workpath & WORKFILE )
+        printlog( "Name the file as " & filepath )
+        Dateiname.settext( filepath )
 
         if ( filetypeID <> "current" ) then
             for iCurrentFilter = 1 to DateiTyp.getItemCount()
@@ -108,7 +108,7 @@ testcase tIncorrectPassword( filetypeID as string )
         endif
 
         printlog( "Load the file again" )
-        hFileOpen( workpath & WORKFILE & suffix )
+        hFileOpen( filepath )
         if ( not hSecurityEnterPasswordOnLoad( PASSWORD_FALSE , false ) ) then
             warnlog( "Something went wrong while using the password dialog" )
         endif
@@ -121,7 +121,7 @@ testcase tIncorrectPassword( filetypeID as string )
         endif
 
         printlog( "Delete the workfile" )
-        hDeleteFile( workpath & WORKFILE & suffix )
+        hDeleteFile( filepath )
     else
         warnlog( "Unable to open file save dialog" )
     endif
diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc
index 3df134d83d33..11c5b0ec6123 100755..100644
--- a/testautomation/framework/optional/includes/security_macrosecurity.inc
+++ b/testautomation/framework/optional/includes/security_macrosecurity.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Macros with all security-levels
 '*
diff --git a/testautomation/framework/optional/includes/security_recommend_password.inc b/testautomation/framework/optional/includes/security_recommend_password.inc
index ab914fe5125b..d7eef2f15146 100755..100644
--- a/testautomation/framework/optional/includes/security_recommend_password.inc
+++ b/testautomation/framework/optional/includes/security_recommend_password.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Password settings in Tools/Options
 '*
diff --git a/testautomation/framework/optional/includes/security_trusted_path.inc b/testautomation/framework/optional/includes/security_trusted_path.inc
index 9115ba2e9f5a..163f0b9305f6 100755..100644
--- a/testautomation/framework/optional/includes/security_trusted_path.inc
+++ b/testautomation/framework/optional/includes/security_trusted_path.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Execute macros from trusted path
 '*
@@ -63,6 +63,7 @@ testcase tSecTrustedPath( cWorkFile as string, iSecLevel as integer )
         endif
     endif
 
+    Sleep (1)
     printlog( "Verify that the macro is executed" )
     kontext "Active"
     if ( active.exists( 2 ) ) then
diff --git a/testautomation/framework/optional/includes/standardbar2.inc b/testautomation/framework/optional/includes/standardbar2.inc
index 2b9f8a95d129..9cb9fb1c066f 100755..100644
--- a/testautomation/framework/optional/includes/standardbar2.inc
+++ b/testautomation/framework/optional/includes/standardbar2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : global update test (Standardbar)
 '*
diff --git a/testautomation/framework/optional/includes/toolbar_behavior.inc b/testautomation/framework/optional/includes/toolbar_behavior.inc
index e9e96f6bb72e..e9e96f6bb72e 100755..100644
--- a/testautomation/framework/optional/includes/toolbar_behavior.inc
+++ b/testautomation/framework/optional/includes/toolbar_behavior.inc
diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc
index 16ca31b09fa4..5fa0284a3495 100755
--- a/testautomation/framework/optional/includes/w_grid_layout1.inc
+++ b/testautomation/framework/optional/includes/w_grid_layout1.inc
@@ -104,8 +104,7 @@ testcase tTextGridDialog_2
     Call hNewDocument
 
     '/// open a test file , and check No Grid checkbox
-    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
-    sMakeReadOnlyDocumentEditable
+    Call hFileOpenLocally( gTesttoolPath + SOURCE_PATH + testFile )
 
     hUseAsyncSlot( "FormatPageWriter" )
     Kontext
@@ -151,8 +150,7 @@ testcase tTextGridDialog_3
 
     '/// open a test file and check Grid(lines onle) checkbox ,
     '/// + set 10 line/page
-    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
-    sMakeReadOnlyDocumentEditable
+    Call hFileOpenLocally( gTesttoolPath + SOURCE_PATH + testFile )
     hUseAsyncSlot( "FormatPageWriter" )
     Kontext
     if active.exists(5) then
@@ -198,8 +196,7 @@ testcase tTextGridDialog_4
 
     '/// open a test file and check Grid(lines and characters) checkbox
     '/// + set 10 line/page and 9 characters/line
-    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
-    sMakeReadOnlyDocumentEditable
+    Call hFileOpenLocally( gTesttoolPath + SOURCE_PATH + testFile )
     hUseAsyncSlot( "FormatPageWriter" )
     Kontext
     if active.exists(5) then
@@ -367,8 +364,7 @@ testcase tFontSizeChanges_1
     sLinesPerPage  = "2"
     sCharsPerLine  = "9"
 
-    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
-    sMakeReadOnlyDocumentEditable
+    Call hFileOpenLocally( gTesttoolPath + SOURCE_PATH + testFile )
     Kontext "DocumentWriter"
     Call DocumentWriter.TypeKeys  "<Shift Right>"
 
@@ -433,10 +429,7 @@ testcase tRubyText_1
     Call hNewDocument
 
     printlog( "Open test file" )
-    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + TEST_FILE )
-
-    printlog( "Remove write protection of document (if set)" )
-    Call sMakeReadOnlyDocumentEditable()
+    hFileOpenLocally( gTesttoolPath + SOURCE_PATH + TEST_FILE )
 
     Kontext "DocumentWriter"
     printlog( "Mark character to the right of current cursor position" )
@@ -486,9 +479,7 @@ testcase tIndentsTest_1
     Call hNewDocument
 
     '/// open a test file , and press TAB in second line
-    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + TEST_FILE )
-
-    sMakeReadOnlyDocumentEditable
+    hFileOpenLocally( gTesttoolPath + SOURCE_PATH + TEST_FILE )
 
     Kontext "DocumentWriter"
     Call DocumentWriter.TypeKeys  "<Down>"
author	Michael Meeks <michael.meeks@novell.com>	2011-03-11 11:35:29 +0000
committer	Michael Meeks <michael.meeks@novell.com>	2011-03-11 11:35:29 +0000
commit	8c59580b88a33d7f0c892c9c53776716ad661fcf (patch)
tree	da43a9c8f3ba7cba7afca05894acc8712f6e36ce /testautomation/framework/optional/includes
parent	e62f74cabe9558e003d3105df7a69e3841dfc9ce (diff)
parent	36979f1c9e43c42e62b0ad5a32b7abb2fc425b5b (diff)