dr77: rebase to m86

7 files changed, 35 insertions, 9 deletions

diff --git a/testautomation/global/required/includes/g_001.inc b/testautomation/global/required/includes/g_001.inc
index 07c294f44e2f..8cbc1bb24526 100755
--- 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
--- 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..100755
--- 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_numberformatter1.inc b/testautomation/global/required/includes/g_numberformatter1.inc
index 2271bc333142..2539e12455e5 100755
--- 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
--- 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..100755
--- 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 100644..100755
--- 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
 '*