sb123: merged in DEV300_m87

66 files changed, 167 insertions, 100 deletions

diff --git a/testautomation/global/input/empty/please_do_not_delete_this_file b/testautomation/global/input/empty/please_do_not_delete_this_file
index c6103b698301..0b366e10364f 100644..100755
--- a/testautomation/global/input/empty/please_do_not_delete_this_file
+++ b/testautomation/global/input/empty/please_do_not_delete_this_file
@@ -1,3 +1,3 @@
 Please do not delete this file. 
 
-thorsten.ziehm@sun.com
\ No newline at end of file
+thorsten.ziehm@oracle.com
\ No newline at end of file
diff --git a/testautomation/global/input/officeinfo.txt b/testautomation/global/input/officeinfo.txt
index 966fba456718..dbca05ecb083 100644..100755
--- a/testautomation/global/input/officeinfo.txt
+++ b/testautomation/global/input/officeinfo.txt
@@ -1,4 +1,4 @@
 [Current program versions]
-Oracle Open Office=3.3
-OpenOffice.org=3.3
-BrOffice.org=3.3
+Oracle Open Office=3.4
+OpenOffice.org=3.4
+BrOffice.org=3.4
diff --git a/testautomation/global/required/includes/g_001.inc b/testautomation/global/required/includes/g_001.inc
index 07c294f44e2f..8cbc1bb24526 100755..100644
--- a/testautomation/global/required/includes/g_001.inc
+++ b/testautomation/global/required/includes/g_001.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Global resource tests for the menu: File
 '*
diff --git a/testautomation/global/required/includes/g_009.inc b/testautomation/global/required/includes/g_009.inc
index 17b31cf3fd08..61ef7dd95c37 100755..100644
--- a/testautomation/global/required/includes/g_009.inc
+++ b/testautomation/global/required/includes/g_009.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Global resource tests for the menu: Help
 '*
diff --git a/testautomation/global/required/includes/g_customize.inc b/testautomation/global/required/includes/g_customize.inc
index f2df48f3c552..07c2dde3927d 100644
--- a/testautomation/global/required/includes/g_customize.inc
+++ b/testautomation/global/required/includes/g_customize.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : update and resouce test for tools/customize
 '*
diff --git a/testautomation/global/required/includes/g_findbar.inc b/testautomation/global/required/includes/g_findbar.inc
index 38af3edd28aa..dd8e9062b604 100644
--- a/testautomation/global/required/includes/g_findbar.inc
+++ b/testautomation/global/required/includes/g_findbar.inc
@@ -87,7 +87,7 @@ testcase tUpdtFindBar()
             warnlog( "Messagebox missing <No matches found>" )
         endif
 
-        warnlog( "#i111984 - exclude <SearchDialog> button from testing" )
+        qaerrorlog( "#i111984 - exclude <SearchDialog> button from testing" )
         goto skip_SearchDialog
 
             printlog( "Search dialog button may not be visible by default" )
diff --git a/testautomation/global/required/includes/g_numberformatter1.inc b/testautomation/global/required/includes/g_numberformatter1.inc
index 2271bc333142..2539e12455e5 100755..100644
--- a/testautomation/global/required/includes/g_numberformatter1.inc
+++ b/testautomation/global/required/includes/g_numberformatter1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : wolfram.garten@sun.com
+'* owner : wolfram.garten@oracle.com
 '*
 '* short description : update and resouce test for numberformatter
 '*
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index b14ceca82c9f..2f7b6aa33ac2 100755..100644
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : update and resouce test for all option pages (at tools/options)
 '*
@@ -579,14 +579,28 @@ testcase tToolsOptionsInternet
         '///+<ol><li>Proxy</li>
         '///+<li>Search</li>
         '///+<li>Mozilla Plugin</li></ol>
-        EchteAnzahl = OptionTabPageZaehler ( 3 , FALSE )
+        EchteAnzahl = OptionTabPageZaehler ( 3 , TRUE )
+        if (EchteAnzahl > 3) then
+			qaErrorLog ("Due to some installed extensions the tabpage count is not 3 it is: " + EchteAnzahl)
+        else 
+            if (EchteAnzahl < 3) then
+                warnlog "Number of tabpages old :   3   new :  " + EchteAnzahl
+            endif
+        endif
     else
         '/// On Unix systems this section includes four tab pages.
         '///+<ol><li>Proxy</li>
         '///+<li>Search</li>
         '///+<li>E-Mail</li>
         '///+<li>Mozilla Plugin</li></ol>
-        EchteAnzahl = OptionTabPageZaehler ( 4 , FALSE )
+        EchteAnzahl = OptionTabPageZaehler ( 4 , TRUE )
+        if (EchteAnzahl > 4) then
+			qaErrorLog ("Due to some installed extensions the tabpage count is not 3 it is: " + EchteAnzahl)
+        else 
+            if (EchteAnzahl < 4) then
+               warnlog "Number of tabpages old :   3   new :  " + EchteAnzahl
+            endif
+        endif
     endif
 
     for i=1 to EchteAnzahl
@@ -647,6 +661,18 @@ testcase tToolsOptionsInternet
                     Call DialogTest ( TabMozillaPlugin )
                 endif
             endif
+        case 5,6 :  Kontext "TabMediaWiki"
+                    if TabMediaWiki.exists then
+                        qaerrorlog "  - Wiki Publisher"
+                        Call DialogTest ( TabMediaWiki )
+                        gefunden = TRUE
+                    endif
+                    Kontext "TabWeblog"
+                    if TabWeblog.exists then
+                        qaerrorlog "  - Weblog Publisher"
+                        Call DialogTest ( TabWeblog )
+                        gefunden = TRUE
+                    endif
         end select
         if gefunden=FALSE then
             Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
diff --git a/testautomation/global/required/includes/g_option_application.inc b/testautomation/global/required/includes/g_option_application.inc
index 4fe4a6cb2cad..233b6cb9d9cc 100644
--- a/testautomation/global/required/includes/g_option_application.inc
+++ b/testautomation/global/required/includes/g_option_application.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : update and resouce test for all option pages (at tools/options)
 '*
diff --git a/testautomation/global/required/includes/g_printing.inc b/testautomation/global/required/includes/g_printing.inc
index e05c1ba1d7e6..15ee12c4308d 100755..100644
--- a/testautomation/global/required/includes/g_printing.inc
+++ b/testautomation/global/required/includes/g_printing.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Resource test for the printing dialog
 '*
diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid
index 866251e652ac..4c7800ba8676 100644..100755
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@ -20,6 +20,8 @@ FileAutopilotPresentation SID_SD_AUTOPILOT
 FileAutopilotAddressDataSource SID_ADDRESS_DATA_SOURCE
 FirstTimeWizard service:com.sun.star.comp.desktop.FirstStart?start
 FileWizardsWebPage service:com.sun.star.wizards.web.CallWizard?start
+FileWizardDocumentConverter sym:vnd.sun.star.script:ImportWizard.Main.Main?language=Basic&location=application
+FileWizardEuroConverter sym:vnd.sun.star.script:Euro.AutoPilotRun.StartAutoPilot?language=Basic&location=application
 FileCloseAndReturn SID_CLOSEDOC
 FileSaveCopy SID_SAVEASDOC
 FileClose .uno:CloseDoc
diff --git a/testautomation/global/system/includes/declare.inc b/testautomation/global/system/includes/declare.inc
index 97ef228a8118..5fed58be6cfd 100644
--- a/testautomation/global/system/includes/declare.inc
+++ b/testautomation/global/system/includes/declare.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : starting routines for declare.bas
 '*
diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc
index eff969fbee2c..ca3764a1a51b 100755..100644
--- a/testautomation/global/system/includes/gvariabl.inc
+++ b/testautomation/global/system/includes/gvariabl.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : all global variables
 '*
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 552102588405..0b83af421eeb 100755..100644
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : get information for startup a test out of important ini-files
 '*
@@ -125,9 +125,9 @@ sub GetIniInformation
     if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then
         if NOT fileExists(gPrivateEnvironmentLocation) then
             qaErrorLog "[PrivateEnvironment] defined in: '"+gTesttoolIni+"', but the path '"+gPrivateEnvironmentLocation+"'does not exist!"
-        else
             gPrivateEnvironmentLocation = ""
         end if
+    else
        gPrivateEnvironmentLocation = ""
    end if
 end sub
diff --git a/testautomation/global/system/includes/inivalue.inc b/testautomation/global/system/includes/inivalue.inc
index cf70fa365f7e..2cc13be957cb 100755..100644
--- a/testautomation/global/system/includes/inivalue.inc
+++ b/testautomation/global/system/includes/inivalue.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : routines to handle ini-files ( read/write items )
 '*
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index fafb5f758a85..880496e3dc42 100755..100644
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : very important routines to start a testscript
 '*
diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc
index bf1ba6a74416..83430bfaa332 100755..100644
--- a/testautomation/global/system/includes/status.inc
+++ b/testautomation/global/system/includes/status.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Routines for the status page feature
 '*
diff --git a/testautomation/global/system/includes/sysinfo.inc b/testautomation/global/system/includes/sysinfo.inc
index f6b7ba369b1f..30e00585d517 100644
--- a/testautomation/global/system/includes/sysinfo.inc
+++ b/testautomation/global/system/includes/sysinfo.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Establish facts of the operating system
 '*
diff --git a/testautomation/global/tools/closeoffice.bas b/testautomation/global/tools/closeoffice.bas
index a2a9200d10c3..da402ecd40f7 100755
--- a/testautomation/global/tools/closeoffice.bas
+++ b/testautomation/global/tools/closeoffice.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Exit the [Star|Open][Office|Suite][.org] nicely
 '*
diff --git a/testautomation/global/tools/compressstatus.bas b/testautomation/global/tools/compressstatus.bas
index b8ed46d3b3f5..679b322096b0 100755
--- a/testautomation/global/tools/compressstatus.bas
+++ b/testautomation/global/tools/compressstatus.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Compress local written status files for submission
 '*
diff --git a/testautomation/global/tools/declare.bas b/testautomation/global/tools/declare.bas
index a874bb674a8c..7d00ef69f824 100755
--- a/testautomation/global/tools/declare.bas
+++ b/testautomation/global/tools/declare.bas
@@ -24,7 +24,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : To get Help ID's from the office
 '*
diff --git a/testautomation/global/tools/includes/optional/t_accels.inc b/testautomation/global/tools/includes/optional/t_accels.inc
index 4d04afaf3554..04718449b13b 100644
--- a/testautomation/global/tools/includes/optional/t_accels.inc
+++ b/testautomation/global/tools/includes/optional/t_accels.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : handle accelerators
 '*
diff --git a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
index fcf8d301db58..f7537d52700c 100755..100644
--- a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@sun.com
+' ** owner : joerg.skottke@oracle.com
 ' **
 ' ** short description : tools for the property-browser test
 ' **
diff --git a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
index b813ee2bf706..f63d610dbdb8 100755..100644
--- a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@sun.com
+' ** owner : joerg.skottke@oracle.com
 ' **
 ' ** short description : tools for tools/macro test
 ' **
diff --git a/testautomation/global/tools/includes/optional/t_control_objects.inc b/testautomation/global/tools/includes/optional/t_control_objects.inc
index 00bafbf04ed5..b1da7d7e8d95 100644
--- a/testautomation/global/tools/includes/optional/t_control_objects.inc
+++ b/testautomation/global/tools/includes/optional/t_control_objects.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Functions to manipulate controls by accessing them as objects
 '*
diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc
index c544db3111fa..7f43b7211630 100755..100644
--- a/testautomation/global/tools/includes/optional/t_docfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : misc functions to handle documents
 '*
diff --git a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
index 0b530af4a274..654b1b76c515 100755..100644
--- a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Tools to ease working with the extension manager
 '*
diff --git a/testautomation/global/tools/includes/optional/t_filetools.inc b/testautomation/global/tools/includes/optional/t_filetools.inc
index 420b14ae9676..070427ef3c5b 100755..100644
--- a/testautomation/global/tools/includes/optional/t_filetools.inc
+++ b/testautomation/global/tools/includes/optional/t_filetools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Functions that work with files like deleting, loading...
 '*
diff --git a/testautomation/global/tools/includes/optional/t_key_tools.inc b/testautomation/global/tools/includes/optional/t_key_tools.inc
index 9bf994824cc9..14906c127c68 100644
--- a/testautomation/global/tools/includes/optional/t_key_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_key_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : tools for evaluation of key=value datalists
 '*
diff --git a/testautomation/global/tools/includes/optional/t_listfuncs.inc b/testautomation/global/tools/includes/optional/t_listfuncs.inc
index ea8a5d5bec68..c90d077db651 100755..100644
--- a/testautomation/global/tools/includes/optional/t_listfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_listfuncs.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Replacements for routines in t_lists.inc adds some
 '*
@@ -140,6 +140,9 @@ function hManageComparisionList( sFileIn as string, sFileOut as string, sListOut
     '///<ul>
 
     const CFN = "hManageComparisionList::"
+
+    ' maximum lines per file. Currently this limit is determined by the help
+    ' tests which have up to 22000 entries + reseve.
     const FILESIZE = 25000
     const COMPARE_SUCCESS = 0
     const ENCODING_UTF8 = "UTF8"
@@ -148,39 +151,33 @@ function hManageComparisionList( sFileIn as string, sFileOut as string, sListOut
     dim aReferenceList( FILESIZE ) as string
 
     if ( GVERBOSE ) then printlog( CFN & "Reading: " & sFileIn )
-    ' disabled hGetDataFileSection because some lists contain a #
-    ' (hash) as value which is identified as comment by the function.
-    ' Fixing this for hGetDataFileSection() would break compatibility
-    ' to other functions both in framework and global module
-    'hgetDataFileSection( sFileIn , aReferenceList() , "" , "" , "" )
+
+    ' Do not use hGetDataFileSection() as strings in some lists may begin with a
+    ' "#" which is interpreted as a comment by hGetDataFileSection()
     listread( aReferenceList(), sFileIn, ENCODING_UTF8 )
+
+    ' Word of caution: If the number of new items equals the number of removed items
+    ' this function returns 0 -> success. This case is highly unlikely to ever happen
+    ' unless someone renames scripts.
     irc = hListCompare( sListOut() , aReferenceList() )
         
-    ' A this point there are three possible states:
-    ' a) the reference list does not exist
-    ' b) the comparision failed
-    ' c) the comparision succeeded
-    ' only if hListCompare() returns 0 the testrun is successful.
-    ' This means that on any error, the ref-list will be written so it can be
-    ' directly reviewed/compared to the "faulty" list without having to run this
-    ' test again (after deleting the ref-file)
     '///+<li>In case the lists are not identical, write the new one to the local work directory</li>
     if ( irc = COMPARE_SUCCESS ) then
         printlog( CFN & "Comparision succeeded" )
         hManageComparisionList() = COMPARE_SUCCESS
     else
-        if ( GVERBOSE ) then
-            printlog( CFN & "The two compared lists differ. There are two likely reasons:" )
-            printlog( CFN & "1) The reference file does not exist at all" )
-            printlog( CFN & "2) Reference and actual UI-Content do not match." )
-            printlog( CFN & "Verify and copy the file: " & sFileOut )
-            printlog( CFN & "to this location........: " & sFileIn  )
-        endif
+        printlog( CFN & "The two compared lists differ. There are a number of possible reasons:" )
+        printlog( CFN & "- Installation requirements are not met (setup /a?, missing packages?)" )
+        printlog( CFN & "- Reference and actual UI-Content do not match: File an issue." )
+        printlog( CFN & "- The reference file does not exist: Follow steps below." )
+        printlog( CFN & "Verify and copy the file: " & sFileOut )
+        printlog( CFN & "to this location........: " & sFileIn  )
+        printlog( CFN & "Check this file into the SCM or attach it to an issue" )
         listwrite( sListOut(), sFileOut, ENCODING_UTF8 )
         hManageComparisionList() = irc
     endif
-    
-    '///+<li>Return 0 if the lists are identical, 1 if not and 2-4 on any other error</li>
+
+    '///+<li>Return number of differences between the lists</li>
     '///</ul>
 
 end function
@@ -266,7 +263,7 @@ function hListCompare( aListOne() as String, aListTwo() as String ) as integer
     if ( ListCount( aTwoOnlyList() ) > 0 ) then
         printlog( CFN & "Objects have been removed from the list" )
         hListPrint( aTwoOnlyList() , "Items found in list TWO only (MISSING)" )
-        hListCompare() = ListCount( aOneOnlyList() ) * -1
+        hListCompare() = ListCount( aTwoOnlyList() ) * -1
     end if
 
     '///</ul>
@@ -428,7 +425,7 @@ function hCountMatchesInList( acItemList() as string, cSearchTerm as string ) as
         endif
     next iCurrentItem
 
-if ( GVERBOSE ) then printlog( CFN & "Exit with result: " & iHitCount )
+    if ( GVERBOSE ) then printlog( CFN & "Exit with result: " & iHitCount )
     hCountMatchesInList() = iHitCount
 
 end function
diff --git a/testautomation/global/tools/includes/optional/t_locale_strings1.inc b/testautomation/global/tools/includes/optional/t_locale_strings1.inc
index d3e7708dbd30..29c4bcf3cb6b 100755..100644
--- a/testautomation/global/tools/includes/optional/t_locale_strings1.inc
+++ b/testautomation/global/tools/includes/optional/t_locale_strings1.inc
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : defining locale dependant strings 
 '*
diff --git a/testautomation/global/tools/includes/optional/t_locale_tools.inc b/testautomation/global/tools/includes/optional/t_locale_tools.inc
index 83a80ad0d107..75d18e2c5856 100644
--- a/testautomation/global/tools/includes/optional/t_locale_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_locale_tools.inc
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : place it here
 '*
diff --git a/testautomation/global/tools/includes/optional/t_macro_tools.inc b/testautomation/global/tools/includes/optional/t_macro_tools.inc
index 18d5245e13f7..6c1fcc478e5a 100755..100644
--- a/testautomation/global/tools/includes/optional/t_macro_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_macro_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@sun.com
+' ** owner : joerg.skottke@oracle.com
 ' **
 ' ** short description : Helper functions for Macro tests
 ' **
diff --git a/testautomation/global/tools/includes/optional/t_ole.inc b/testautomation/global/tools/includes/optional/t_ole.inc
index 63c55705add9..13138dfc52ab 100755..100644
--- a/testautomation/global/tools/includes/optional/t_ole.inc
+++ b/testautomation/global/tools/includes/optional/t_ole.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Tools for OLE objects
 '*
diff --git a/testautomation/global/tools/includes/optional/t_security_tools.inc b/testautomation/global/tools/includes/optional/t_security_tools.inc
index 24a718fd7a48..28625be35880 100755..100644
--- a/testautomation/global/tools/includes/optional/t_security_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_security_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Tools to ease testing of security related funtionality
 '*
diff --git a/testautomation/global/tools/includes/optional/t_set_standard_controls.inc b/testautomation/global/tools/includes/optional/t_set_standard_controls.inc
index bcc8cda10e5b..8384edcc27d1 100644
--- a/testautomation/global/tools/includes/optional/t_set_standard_controls.inc
+++ b/testautomation/global/tools/includes/optional/t_set_standard_controls.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Tool library for setting controls and verifying the functionality
 '*
diff --git a/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc b/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc
index cdc0eae38540..55da2fc1c9aa 100644
--- a/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc
+++ b/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Global tools for spreadsheet
 '*
diff --git a/testautomation/global/tools/includes/optional/t_stringtools.inc b/testautomation/global/tools/includes/optional/t_stringtools.inc
index 914d8b7c6ab4..7f946fd3b046 100755..100644
--- a/testautomation/global/tools/includes/optional/t_stringtools.inc
+++ b/testautomation/global/tools/includes/optional/t_stringtools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Functions for manipulation of strings
 '*
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
index 0bd7ae50525f..77c72a9ec2dc 100755..100644
--- a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Toolbar tools 1
 '*
@@ -36,7 +36,7 @@
 '\*************************************************************************************
 
 '******************************************************************
-'* Created by hercule.li@sun.com
+'* Created by hercule.li@oracle.com
 '* This function will active or inactive image button in toolbar
 '* sToolbar : Toolbar name                  
 '* sObject  : image button name                   
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
index dea5fe027a63..892dbd09bb36 100644
--- a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Toolbar tools - Writer
 '*
diff --git a/testautomation/global/tools/includes/optional/t_treelist_tools.inc b/testautomation/global/tools/includes/optional/t_treelist_tools.inc
index 0c1d17e62c91..e9c254ac07b4 100755..100644
--- a/testautomation/global/tools/includes/optional/t_treelist_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_treelist_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Helpers for accessing treelists
 '*
@@ -255,6 +255,15 @@ end function
 
 '*******************************************************************************
 
+function hGetAllNodeNames( oControl as object , lsList() as string ) as integer
+
+    hExpandAllNodes( oControl )
+    hGetAllNodeNames() = hGetVisibleNodeNames( oControl, lsList() )
+
+end function
+
+'*******************************************************************************
+
 function hGetVisibleNodeNames( oControl as object , lsList() as string ) as integer
     
     '///<h3>Retrieve the names of all nodes in a treelist</h3>
diff --git a/testautomation/global/tools/includes/optional/t_ui_filters.inc b/testautomation/global/tools/includes/optional/t_ui_filters.inc
index b76765e05069..7b9dd66e1a40 100755..100644
--- a/testautomation/global/tools/includes/optional/t_ui_filters.inc
+++ b/testautomation/global/tools/includes/optional/t_ui_filters.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Get the UI names for default filters
 '*
diff --git a/testautomation/global/tools/includes/optional/t_user_info.inc b/testautomation/global/tools/includes/optional/t_user_info.inc
index 7ad00b9e539e..d4771be2e3c9 100755..100644
--- a/testautomation/global/tools/includes/optional/t_user_info.inc
+++ b/testautomation/global/tools/includes/optional/t_user_info.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Extension Update Test
 '*
diff --git a/testautomation/global/tools/includes/optional/t_xml1.inc b/testautomation/global/tools/includes/optional/t_xml1.inc
index e84dad7ddf47..5afd05cbb22f 100644
--- a/testautomation/global/tools/includes/optional/t_xml1.inc
+++ b/testautomation/global/tools/includes/optional/t_xml1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : helge.delfs@sun.com
+'* Owner : helge.delfs@oracle.com
 '*
 '* short description : simple XML-Parser for XML-Files from Registration-Database and Routines to work with SAX-Parser in Testtool
 '*
diff --git a/testautomation/global/tools/includes/optional/t_xml2.inc b/testautomation/global/tools/includes/optional/t_xml2.inc
index 93bd725dbc38..46dc9b350393 100644
--- a/testautomation/global/tools/includes/optional/t_xml2.inc
+++ b/testautomation/global/tools/includes/optional/t_xml2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : XML search routines II
 '*
diff --git a/testautomation/global/tools/includes/optional/t_xml_filter1.inc b/testautomation/global/tools/includes/optional/t_xml_filter1.inc
index e82b7f17553f..7ccab1c0db88 100644
--- a/testautomation/global/tools/includes/optional/t_xml_filter1.inc
+++ b/testautomation/global/tools/includes/optional/t_xml_filter1.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Tools / XML Filter Settings Resource Test
 '*
diff --git a/testautomation/global/tools/includes/required/t_dir.inc b/testautomation/global/tools/includes/required/t_dir.inc
index 04c4bd8956f9..ee673e6b1c47 100755..100644
--- a/testautomation/global/tools/includes/required/t_dir.inc
+++ b/testautomation/global/tools/includes/required/t_dir.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : functions for directories and files; execution happens in the office
 '*
diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc
index 61c6afadab03..ff07554bca35 100644..100755
--- a/testautomation/global/tools/includes/required/t_doc1.inc
+++ b/testautomation/global/tools/includes/required/t_doc1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Global Routines for Document Handling
 '*
diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc
index 4941d0fcf7ad..4192563b0eba 100755..100644
--- a/testautomation/global/tools/includes/required/t_doc2.inc
+++ b/testautomation/global/tools/includes/required/t_doc2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Global Routines for Document Handling; Part two
 '*
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index 42b575c1187a..4b0ddd09318b 100755..100644
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Global routines for loading, saving, printing, export
 '*
@@ -114,11 +114,28 @@ function hIsNamedDocLoaded( cFileName as string ) as boolean
 
     dim cDocumentName as string
     dim iDocumentNameLength as integer
+    dim bTemplateDocument as boolean
 
     hIsNamedDocLoaded() = false
 
+    ' If the requested document is a template, we cannot use its filename to
+    ' identify the document as it is named "Untitled 1" or "Untitled" in the
+    ' FileSave dialog and the document properties dialog. The string is locale
+    ' dependent. So we do a shortcut here, the calling tests fail at a later
+    ' point if this function does not work properly
+    
+    select case( right( cFileName, 4 ) )
+    case ".vor", ".dot", ".sti", ".pot", ".std", ".xlt", ".stc", ".ots", "xltm", "xltx"
+        if ( GVERBOSE ) then printlog( CFN & "Template document filtered" )
+        hIsNamedDocLoaded() = true
+        exit function
+    end select
+
     if ( hUseAsyncSlot( "FileProperties" ) <> RC_FAILURE ) then
 
+        kontext
+        active.setpage(tabdokument)
+
         kontext "TabDokument"
         if ( TabDokument.exists( 2 ) ) then
 
diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc
index f6a2beca6eb0..243483be9e7d 100755..100644
--- a/testautomation/global/tools/includes/required/t_filters.inc
+++ b/testautomation/global/tools/includes/required/t_filters.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Retrieve and set filternames and suffixes
 '*
@@ -34,6 +34,21 @@
 private const LENGTH_OF_FILTERFILE = 100
 private const FILE_DATA_SIZE = 300
 
+function hCheckForBinfilters() as boolean
+
+    try
+        hGetSuffix( "569" )
+        hCheckForBinfilters() = true
+    catch
+        warnlog( "Optional legacy filters package is not installed" )
+        printlog( "Please restart the setup to install the missing filters" )
+        hCheckForBinfilters() = false
+    endcatch
+
+end function
+
+'*******************************************************************************
+
 function hGetSuffix( optional cBuildId as string ) as string
 
     ' This function retrieves the suffix depending on the build id (e.g. 680)
diff --git a/testautomation/global/tools/includes/required/t_lists.inc b/testautomation/global/tools/includes/required/t_lists.inc
index f32db2f29277..9fa2172fbccf 100755..100644
--- a/testautomation/global/tools/includes/required/t_lists.inc
+++ b/testautomation/global/tools/includes/required/t_lists.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : general routines to work with lists (arrays)
 '*
diff --git a/testautomation/global/tools/includes/required/t_menu.inc b/testautomation/global/tools/includes/required/t_menu.inc
index a7c64b37865d..830012cc7dae 100755..100644
--- a/testautomation/global/tools/includes/required/t_menu.inc
+++ b/testautomation/global/tools/includes/required/t_menu.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : wrappers for accessing menues (context-, bar-, button- menues)
 '*
diff --git a/testautomation/global/tools/includes/required/t_option.inc b/testautomation/global/tools/includes/required/t_option.inc
index b94d4a028833..4f4467263072 100644
--- a/testautomation/global/tools/includes/required/t_option.inc
+++ b/testautomation/global/tools/includes/required/t_option.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : General option test (sub-routines for options tests)
 '*
diff --git a/testautomation/global/tools/includes/required/t_option2.inc b/testautomation/global/tools/includes/required/t_option2.inc
index 2b10f50ce00a..7e97c58d2848 100755..100644
--- a/testautomation/global/tools/includes/required/t_option2.inc
+++ b/testautomation/global/tools/includes/required/t_option2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools library for options testcases
 '*
diff --git a/testautomation/global/tools/includes/required/t_tools1.inc b/testautomation/global/tools/includes/required/t_tools1.inc
index 7242d1c3653d..051afec0ad24 100755..100644
--- a/testautomation/global/tools/includes/required/t_tools1.inc
+++ b/testautomation/global/tools/includes/required/t_tools1.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Tools (1)
 '*
diff --git a/testautomation/global/tools/includes/required/t_tools2.inc b/testautomation/global/tools/includes/required/t_tools2.inc
index 449977d9329d..76422a5e8108 100755..100644
--- a/testautomation/global/tools/includes/required/t_tools2.inc
+++ b/testautomation/global/tools/includes/required/t_tools2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Global Tools II
 '*
diff --git a/testautomation/global/tools/includes/required/t_tools3.inc b/testautomation/global/tools/includes/required/t_tools3.inc
index 27ac128437ee..4b29928a1b93 100755..100644
--- a/testautomation/global/tools/includes/required/t_tools3.inc
+++ b/testautomation/global/tools/includes/required/t_tools3.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Global Tools III
 '*
@@ -34,7 +34,7 @@
 sub hToolbarSelect( sType as string, sOpen as boolean, optional SetToDefault as boolean )
     Dim sDefault as integer, sKontext as string, sPosition as integer
     Dim SteppedThrough as boolean
-    '/// Created by helge.delfs@sun.com
+    '/// Created by helge.delfs@oracle.com
     '/// This function opens/closes a toolbar through View/Toolbar menu
     '/// Required parameters:
     '/// sType as string 		-> Name of the toolbar to be opened / closed
@@ -840,7 +840,7 @@ sub hToolbarSelect( sType as string, sOpen as boolean, optional SetToDefault as
 end sub
 
 sub hCloseAllToolbars
-    '/// Created by thorsten.bosbach@sun.com
+    '/// Created by thorsten.bosbach@oracle.com
     '/// This function closes all known toolbars which are not docked
     '/// only if Build ID is below 8892
     if (gBuild < 8892) AND (gBuild > 8888) then
@@ -1108,7 +1108,7 @@ function hUseAsyncSlot( cSlot as string ) as integer
     iTime = iRetries * DELAY
 
     ' Timeout is -1
-    if ( iRetries = MAX_RETRIES ) then iTime = RC_TIMEOUT
+    if ( iRetries >= MAX_RETRIES ) then iTime = RC_TIMEOUT
 
     if ( GVERBOSE ) then printlog( CFN & "Exit with rc=" & iTime )
     hUseAsyncSlot() = iTime
@@ -1142,7 +1142,7 @@ function hClickButton( oButton as object ) as integer
     ' Total time used
     iTime = iRetries * DELAY
 
-    if ( iRetries = MAX_RETRIES ) then iTime = RC_TIMEOUT
+    if ( iRetries >= MAX_RETRIES ) then iTime = RC_TIMEOUT
 
     if ( GVERBOSE ) then printlog( CFN & "Exit with rc=" & iTime )
     hClickButton() = iTime
diff --git a/testautomation/global/tools/resetoffice.bas b/testautomation/global/tools/resetoffice.bas
index e6566c15de0c..ca7590ad753f 100755
--- a/testautomation/global/tools/resetoffice.bas
+++ b/testautomation/global/tools/resetoffice.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Exit the [Star|Open][Office|Suite][.org] and delete user directory
 '*
diff --git a/testautomation/global/tools/wintree.bas b/testautomation/global/tools/wintree.bas
index 944091e37f48..0d4c376316a0 100755
--- a/testautomation/global/tools/wintree.bas
+++ b/testautomation/global/tools/wintree.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Show the complete window hierarchy
 '*
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index f2c40134d964..964027cbc7b2 100755
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -26,7 +26,7 @@
 '*
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* Description : Declaration of bars and buttons
 '*               Note: To be in kmost cases compatible with old regresson
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index 35869e0c2b72..19ba11ec6695 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -503,3 +503,6 @@ CustomLanguage sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG
 DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE
 
 *HyperlinkDialog HID_HYPERLINK_DIALOG
+CloseButton HID_ICCDIALOG_CANCEL_BTN
+ApplyButton HID_ICCDIALOG_OK_BTN
+BackButton HID_ICCDIALOG_RESET_BTN
diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win
index 4104b70f0f2a..4e3e0cd2a1be 100755
--- a/testautomation/global/win/edia_t_z.win
+++ b/testautomation/global/win/edia_t_z.win
@@ -159,11 +159,6 @@ Preview HID_SC_ASCII_TABCTR
 *UnsatisfiedDependencies desktop:ModalDialog:RID_DLG_DEPENDENCIES
 UnsatisfiedDependencyList desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST
 
-*WarningPrintOptions sd:ModalDialog:DLG_PRINT_WARNINGS
-FitPage sd:RadioButton:DLG_PRINT_WARNINGS:RBT_SCALE
-Posterize sd:RadioButton:DLG_PRINT_WARNINGS:RBT_POSTER
-TrimPage sd:RadioButton:DLG_PRINT_WARNINGS:RBT_CUT
-
 *WarningPrintTransparency sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY
 NoButton sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO
 DoNotShowAgain sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN
diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win
index 244e02f717bc..de5481e2e3c2 100755
--- a/testautomation/global/win/etab_h_o.win
+++ b/testautomation/global/win/etab_h_o.win
@@ -180,6 +180,7 @@ LastRecordButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST
 ExcludeCheckBox sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE
 EditButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT
 
+*TabMediaWiki sym:vnd.com.sun.star.wiki:settings
 
 *TabMemory HID_OFA_TP_MEMORY
 UndoSteps cui:NumericField:OFA_TP_MEMORY:ED_UNDO
diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win
index aa0155908c5d..b7db16fd1ef4 100755
--- a/testautomation/global/win/etab_t_z.win
+++ b/testautomation/global/win/etab_t_z.win
@@ -101,6 +101,8 @@ ColumnLength HID_TAB_ENT_TEXT_LEN
 ColumnAutoValue dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO
 ColumnAuto dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO
 
+*TabWeblog sym:vnd.com.sun.star.blogger:settings
+
 *TabXMLGeneral HID_XML_FILTER_TABPAGE_BASIC
 FilterName HID_XML_FILTER_NAME
 Application HID_XML_FILTER_APPLICATION
diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win
index 4cacc4dda5cc..d25c83ba8997 100755
--- a/testautomation/global/win/sys_dial.win
+++ b/testautomation/global/win/sys_dial.win
@@ -127,7 +127,7 @@ OrdnerName fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME
 *TranslationWindow svtools:WorkWindow:TT_INLINE_TRANSLATION svtools:FloatingWindow:TT_INLINE_TRANSLATION
 
 ' **** specal longnames for bas test
-' **** author marc.schwanz@sun.com
+' **** author marc.neumann@oracle.com
 *MSC_Special_Dialog MSC_Super_ID
 *MSC_Special_Dialog2 MSC_Super_ID2
 *MSC_Special_Dialog3 MSC_Super_ID3