merged DEV300

5 files changed, 33 insertions, 69 deletions

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/configuration.inc b/testautomation/framework/optional/includes/configuration.inc
index 0fce11bddd1b..9e63a4a9ad7e 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/options_loadsave_general.inc b/testautomation/framework/optional/includes/options_loadsave_general.inc
index d320fb6a6d72..69e08f7bef20 100644
--- a/testautomation/framework/optional/includes/options_loadsave_general.inc
+++ b/testautomation/framework/optional/includes/options_loadsave_general.inc
@@ -176,7 +176,8 @@ testcase tLoadSaveGeneral
         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
 
diff --git a/testautomation/framework/optional/includes/options_ooo_colors.inc b/testautomation/framework/optional/includes/options_ooo_colors.inc
index f7c68095e198..92489ecb15fc 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 = 99
-    const CHANGED_COLOR_COUNT = 100
+    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 )
diff --git a/testautomation/framework/optional/includes/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc
index 78a6f48a770b..2051fcefbf3d 100644
--- a/testautomation/framework/optional/includes/options_ooo_general.inc
+++ b/testautomation/framework/optional/includes/options_ooo_general.inc
@@ -85,7 +85,8 @@ testcase tOOoGeneral
     hToolsOptions ( "StarOffice", "General" )
 
     if Zweistellig.GetText <> "1950" then
-        Warnlog "#i29810# - Year ( 2 digits ) => changes not saved: " + Zweistellig.GetText
+        '#i29810# 
+        Warnlog "Year ( 2 digits ) => changes not saved: " + Zweistellig.GetText
     endif
 
     if not Aktivieren.IsChecked then
@@ -116,7 +117,8 @@ testcase tOOoGeneral
     hToolsOptions ( "StarOffice", "General" )
 
     if ( Zweistellig.GetText <> "1800" ) then
-        Warnlog( "#i29810# - Year ( 2 digits ) => changes not saved : " & Zweistellig.GetText() )
+        '#i29810# 
+        Warnlog( "Year ( 2 digits ) => changes not saved : " & Zweistellig.GetText() )
     endif
 
     If DruckenStatus.IsChecked  then