automationdev300m84: Local merge

18 files changed, 68 insertions, 98 deletions

diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index ba2c8c692d4e..367281d0deaf 100755
--- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -4,7 +4,7 @@
     <node oor:name="States">
       <node oor:name="private:resource/toolpanel/com.example.TestPanel1" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">ein Panel</value>
+          <value>ein Panel</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>true</value>
@@ -12,7 +12,7 @@
       </node>
       <node oor:name="private:resource/toolpanel/com.example.TestPanel2" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">noch ein Panel</value>
+          <value>noch ein Panel</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>true</value>
diff --git a/testautomation/extensions/optional/input/issues/LoggingOptions.xcs b/testautomation/extensions/optional/input/issues/LoggingOptions.xcs
index e87474bba2a2..ca1ee9a4b6cb 100644
--- a/testautomation/extensions/optional/input/issues/LoggingOptions.xcs
+++ b/testautomation/extensions/optional/input/issues/LoggingOptions.xcs
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Logging" oor:package="org.openoffice.Office" xml:lang="en-US">
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Logging" oor:package="org.openoffice.Office">
   <templates>
     <group oor:name="LoggerSettings">
       <group oor:name="HandlerSettings" oor:extensible="true">
diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc
index 779ab3c0a8aa..2adb42638d02 100644
--- a/testautomation/framework/required/includes/window_functions.inc
+++ b/testautomation/framework/required/includes/window_functions.inc
@@ -250,7 +250,12 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
 
     ' Verify that the productname is contained within the string
     if ( iProductNamePosition = STRING_NOT_FOUND ) then
-        warnlog( "The product name is missing" )
+        if ( lcase( gPlatform ) = "osx" ) then
+            printlog( "The product name is missing" )
+            ' life is different on that platform compared to testtool world
+        else
+            warnlog( "The product name is missing" )
+        endif
     endif
 
     ' Verify that the application name (e.g. "Writer") is contained in the string
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index b14ceca82c9f..fe462038899f 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -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/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 552102588405..aa305b9a1a21 100755
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -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/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index 42b575c1187a..1b9cd4c028df 100755
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -119,6 +119,8 @@ function hIsNamedDocLoaded( cFileName as string ) as boolean
 
     if ( hUseAsyncSlot( "FileProperties" ) <> RC_FAILURE ) then
 
+        kontext
+        active.setpage(tabdokument)
         kontext "TabDokument"
         if ( TabDokument.exists( 2 ) ) then
 
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/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc
index c7de07588367..57990c2a16b0 100644
--- a/testautomation/graphics/required/includes/global/id_006.inc
+++ b/testautomation/graphics/required/includes/global/id_006.inc
@@ -31,7 +31,6 @@
 '*
 '\**********************************************************************************
 
-'------------------------------------------------------------------------------
 sub id_Tools
     printLog "---------    id_006    ----------"
     call tiToolsSpellchecking
@@ -105,9 +104,9 @@ testcase tiToolsSpellcheckingAutomatic
 endcase
 '-------------------------------------------------------------------------------
 testcase tiToolsThesaurus
-
     Dim sWord as string
     Dim sExt as string
+    Dim sFileName as string
 
     'for normal text, the thesaurus is enabled,
     'if the format->character->language of the word has a thesaurus
@@ -195,55 +194,9 @@ testcase tiToolsThesaurus
     if Thesaurus.Exists(3) then
         Thesaurus.Cancel
     else
-        sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odg"))
-    end if
-    if FileExists ( sFileName ) = FALSE then
-        warnlog "The language-file was not found or accessible! The test ends."
-        goto endsub
+         warnlog "the thesaurus does not appear"
     end if
-    Call hFileOpen (sFileName)
-        
-        sleep (2)
-    
-        hTypeKeys "<TAB><RETURN>"
-        hTypeKeys "<END><SHIFT HOME>"
-    
-        '   Call hTextrahmenErstellen ("SimpleTest" + "<Mod1 Shift left>", 10, 10, 30, 40)
-        try
-            '/// Tools->Thesaurus ///'
-            ExtrasThesaurusDraw
-            Kontext "Thesaurus"
-                Call DialogTest ( Thesaurus )
-                '/// click button 'language' ///'
-                Sprache.Click
-                Kontext "SpracheAuswaehlen"
-                    Call DialogTest ( SpracheAuswaehlen )
-                    '/// cancel dialog 'select language' ///'
-                    SpracheAuswaehlen.cancel
-            Kontext "Thesaurus"
-                '/// click button 'search' ///'
-                Nachschlagen.Click
-                kontext
-                '/// if messagebox exist, say OK; (word not found) ///'
-                if Messagebox.exists (5) then
-                    printlog "Messagebox: word not in thesaurus: '"+Messagebox.gettext+"'"
-                    Messagebox.ok
-                end if
-                sleep 1
-                Kontext "Thesaurus"
-                    '/// cancel dialog 'Thesaurus' ///'
-                    Thesaurus.Cancel
-        catch
-            warnlog "Thesaurus didn't work :-("
-        endcatch
-        sleep 1
-        '/// close application ///'
-        Call hCloseDocument
-    else
-        goto endsub
-    endif
     Call hCloseDocument
-
 endcase
 '-------------------------------------------------------------------------------
 testcase tiToolsHyphenation
@@ -519,4 +472,4 @@ testcase tiToolsEyedropper
     '/// close application ///'
     Call hCloseDocument
 endcase
-'-------------------------------------------------------------------------------
\ No newline at end of file
+
diff --git a/testautomation/graphics/required/includes/impress/i_opt_1_.inc b/testautomation/graphics/required/includes/impress/i_opt_1_.inc
index ad62c64acf50..148bbe980424 100644
--- a/testautomation/graphics/required/includes/impress/i_opt_1_.inc
+++ b/testautomation/graphics/required/includes/impress/i_opt_1_.inc
@@ -31,14 +31,6 @@
 '*
 '\******************************************************************************
 
-sub i_opt_1_.inc
-
-    call tiAlwaysWithCurrentPage()
-
-end sub
-
-'*******************************************************************************
-
 testcase tiAlwaysWithCurrentPage()
     dim i as integer
 
@@ -202,4 +194,4 @@ testcase tiAlwaysWithCurrentPage()
     setStartCurrentPage(true)
     Call hCloseDocument
 endcase
-'-------------------------------------------------------------------------------
+
diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc
index 87052558b8f9..a160699d74ca 100644
--- a/testautomation/graphics/required/includes/impress/im_003_.inc
+++ b/testautomation/graphics/required/includes/impress/im_003_.inc
@@ -132,31 +132,23 @@ testcase tiViewPanes
 endcase 'tiViewPanes
 '---------------------------------------------------------
 testcase tiViewMasterView
-
     printlog "open application"
     Call hNewDocument
-
     printlog "View->Master View->Drawing View"
     hUseAsyncSlot( "ViewWorkspaceDrawingView" )
-
     printlog "View->Master View->Outline View "
     hUseAsyncSlot( "ViewWorkspaceOutlineView" )
-
     printlog "View->Master View->Slides View "
-    hUseAsyncSlot( "ViewWorkspaceSlidesView" )
-
+    ViewWorkspaceSlidesView
+    sleep 1
     printlog "View->Master View->Notes View "
     hUseAsyncSlot( "ViewWorkspaceNotesView" )
-
     printlog "View->Master View->Handout View "
     hUseAsyncSlot( "ViewWorkspaceHandoutView" )
-
     printlog "View->Master View->Drawing View "
     hUseAsyncSlot( "ViewWorkspaceDrawingView" )
-
     printlog "close application "
     Call hCloseDocument
-
 endcase 'tiViewMasterView
 '---------------------------------------------------------
 testcase tiViewSlideMaster
diff --git a/testautomation/graphics/required/includes/impress/im_007_.inc b/testautomation/graphics/required/includes/impress/im_007_.inc
index 9d4860a0ba56..0a598f59c520 100644
--- a/testautomation/graphics/required/includes/impress/im_007_.inc
+++ b/testautomation/graphics/required/includes/impress/im_007_.inc
@@ -41,6 +41,7 @@ sub im_007_
     call tSlideShowShowHideSlide()
     call tSlideShowCustomAnimation()
     call tSlideShowInteraction()
+    call tSlideShowAnimation()
 
 end sub
 
diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc
index 2fc34b5c1f01..254dfc3b2eed 100755
--- a/testautomation/math/optional/includes/m_101_.inc
+++ b/testautomation/math/optional/includes/m_101_.inc
@@ -280,7 +280,11 @@ testcase tFilePassword
       printlog "   Check: (" + i + "/" + x +"): " +sTemp
       if Passwort.isEnabled then
          if NOT((instr(sTemp,gMathFilter) = 1)OR(instr(sTemp," (.sxm)") > 1)) then 
-             warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
+             if (4=i) then
+                warnlog "#i112895# (" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
+             else
+                warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
+            endif
          endif
       else
          if (instr(sTemp,gMathFilter) = 1)OR(instr(sTemp," (.sxm)") > 1) then 
diff --git a/testautomation/math/optional/includes/m_105.inc b/testautomation/math/optional/includes/m_105.inc
index 3bfac36f6f25..8c0bdf773050 100644..100755
--- a/testautomation/math/optional/includes/m_105.inc
+++ b/testautomation/math/optional/includes/m_105.inc
@@ -487,8 +487,6 @@ testcase tToolsCatalog
 endcase
 
 testcase tToolsCatalogNew
-   qaerrorlog "#i64504# Symbol set name is not saved on exiting OOo"
-goto endsub
     dim i, j as integer
     dim sTemp as string
     dim iStartingSymbolSetCount as integer
@@ -626,7 +624,7 @@ goto endsub
                         SymbolSet.select ""
                     endcatch
                     i = Symbol.getItemCount
-                    if i <> 1 then
+                    if i < 2 then
                         warnlog "Symbol not available in new Symbolset: intsead of 1: " + i
                     endif
                     SymbolSet.setText "TBOnewSymbolSetdelete"
diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
index dc54ca10361e..ee96ffadb6fd 100644..100755
--- a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
@@ -583,15 +583,15 @@ testcase tEditImageMap
     printlog " Click on 'Active'-button"
     Aktiv.Click
     '/// Click on 'Macro...'-button
-	printlog " Click on 'Macro...'-button"
-	warnlog "#i102720# => crash, therefor this functionality is outcommented"
-'		Makro.Click
-'		Kontext "MakroZuweisen"
-'		Call DialogTest ( MakroZuweisen )
-'		'/// Close 'Assign Macro'-dialog with Cancel
-'		printlog " Close 'Assign Macro'-dialog with Cancel"
-'		MakroZuweisen.Cancel
-'		Kontext "ImageMapEditor"
+    printlog " Click on 'Macro...'-button"
+'    warnlog "#i102720# => crash, therefor this functionality is outcommented"
+    Makro.Click
+    Kontext "MakroZuweisen"
+    Call DialogTest ( MakroZuweisen )
+    '/// Close 'Assign Macro'-dialog with Cancel
+    printlog " Close 'Assign Macro'-dialog with Cancel"
+    MakroZuweisen.Cancel
+    Kontext "ImageMapEditor"
     '/// Click on 'Properties'-button
     printlog " Click on 'Properties'-button"
     Eigenschaften.Click
diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc
index 91a806fd33ae..78dbcb0ae18b 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc
@@ -166,7 +166,6 @@ testcase tToolsMacro
     printlog " Close Select Certificate' dialog with 'Cancel'"
     SelectCertificate.Cancel
     Kontext "DigitalSignature"
-    add.click
     '/// Close 'Digital Signatures' dialog with 'Cancel'
     printlog " Close 'Digital Signatures' dialog with 'Cancel'"
     DigitalSignature.ok
diff --git a/testautomation/writer/required/includes/w_005b_.inc b/testautomation/writer/required/includes/w_005b_.inc
index ad7c69346cf8..1fa91373ec4a 100644..100755
--- a/testautomation/writer/required/includes/w_005b_.inc
+++ b/testautomation/writer/required/includes/w_005b_.inc
@@ -176,7 +176,7 @@ testcase tFormatArrange
 
     printlog " Insert a graphic from file '..\writer\required\input\graphics\jolink.jpg'"
     Call hGrafikEinfuegen ( gTesttoolPath + "writer\required\input\graphics\jolink.jpg" )
-
+    sleep(2)
     try
         printlog " Format / Arrange / Bring to front"
         FormatArrangeBringToFrontCalc
@@ -219,12 +219,12 @@ testcase tFormatAlignment
     Call hNewDocument
     printlog " Insert a graphic from file '..\writer\required\input\graphics\jolink.jpg'"
     Call hGrafikEinfuegen ( gTesttoolPath + "writer\required\input\graphics\jolink.jpg" )
-
+    sleep(2)
     if ( gApplication = "HTML" ) then
         printlog " Format / Anchor / to Page"
         hUseAsyncSlot( "FormatAnchorToPage" )
     end if
-
+    
     try
         printlog " Format / Alignment / Left"
         FormatAlignmentLeft