CWS-TOOLING: integrate CWS native216

2008-12-18 10:50:56 +0100 jsk  r265675 : #i97390#
2008-12-18 09:35:32 +0100 jsk  r265668 : #i97110#
2008-12-17 17:38:44 +0100 tbo  r265649 : #i97365# double entries in hid.lst
2008-12-17 09:01:55 +0100 jsk  r265580 : #i97343#
2008-12-16 21:11:08 +0100 jsk  r265574 : #i97110#
2008-12-16 15:59:30 +0100 jsk  r265555 : #i97110#
2008-12-16 15:57:57 +0100 jsk  r265554 : #i97110#
2008-12-11 11:49:29 +0100 is  r265274 : #i97101# new oooimprovement extension
2008-12-11 11:48:33 +0100 is  r265272 : #i97101# new oooimprovement extension

6 files changed, 63 insertions, 1 deletions

diff --git a/testautomation/global/hid/hid.lst b/testautomation/global/hid/hid.lst
index 35990cc11edf..330ae19ba0a5 100755
--- a/testautomation/global/hid/hid.lst
+++ b/testautomation/global/hid/hid.lst
@@ -7180,6 +7180,10 @@ svx:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW 705597967
 svx:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH 705597971
 svx:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST 705613314
 svx:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT 705614341
+svx:TabPage:RID_SVXPAGE_IMPROVEMENT 705658880
+svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES 705659404
+svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO 705659405
+svx:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA 705663507
 svx:TabPage:RID_SVX_GRFFILTER_DLG_EMBOSS_TAB 706232320
 svx:Edit:RID_SVXTABPAGE_GALLERY_GENERAL:EDT_MS_NAME 706627585
 svx:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW 706675715
@@ -8091,6 +8095,9 @@ sw:Edit:TP_MAILCONFIG:ED_SERVER 879364107
 sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION 879366672
 sw:PushButton:TP_MAILCONFIG:PB_TEST 879366677
 sw:NumericField:TP_MAILCONFIG:NF_PORT 879368205
+sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NEW_START 880543233
+sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NUMBER_NEW_START 880543234
+sd:NumericField:RID_TABPAGE_PARA_NUMBERING:NF_NEW_START 880547843
 sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_PAGE 881132033
 sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_CHAPTER 881132034
 sw:Edit:TP_FOOTNOTEOPTION:ED_CONT 881133609
@@ -8839,6 +8846,9 @@ svx:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK 1242498074
 svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE 1242518028
 svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL 1242518029
 svx:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE 1242518030
+svx:ModalDialog:RID_SVXPAGE_IMPROVEMENT 1242529792
+svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES_b 1242530316
+svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO_b 1242530317
 svx:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES 1243022341
 svx:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH 1243027970
 svx:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT 1243027972
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 22566d212b1c..e5a15dbf602e 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -120,6 +120,15 @@ testcase tToolsOptionsStarOffice
     Kontext "ExtrasOptionenDlg"
     EchteAnzahl = Optionsliste.GetItemCount - iSectionNumber
     iMenuShould = 13
+
+    
+    if ( gExtensionOOoImprovementIsInstalled ) then
+        iMenuShould = iMenuShould + 1
+        printlog( "The OOoImprovementExtension is installed" )
+    else
+        qaerrorlog( "The OOoImprovementExtension is not installed" )
+    endif 
+
     if EchteAnzahl <> iMenuShould then
         if ((gtplatform = "sol") OR (gtplatform = "x86") OR gOOO) AND EchteAnzahl = 12 then
             printLog "One Tabpage is missing. This is ok for a patched Solaris (sparc and x86) or OOo installation." 
@@ -302,6 +311,14 @@ testcase tToolsOptionsStarOffice
                    Call DialogTest( TabOnlineUpdate )
                 endif
                 'CheckNow.click
+        case 14: Kontext "TabOOoImprovement"
+                 if ( gExtensionOOoImprovementIsInstalled ) then
+                     printlog( "  - OpenOffice.org Improvement Program" )
+                     if ( TabOOoImprovement.isVisible() ) then
+                         gefunden = TRUE
+                         Call DialogTest( TabOOoImprovement )
+                     endif
+                 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/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc
index 30f65c97db59..d5c1aee37046 100755
--- a/testautomation/global/system/includes/gvariabl.inc
+++ b/testautomation/global/system/includes/gvariabl.inc
@@ -172,6 +172,9 @@ Global Const GC_MACRO_SECURITY_LEVEL_HIGH     = 2  '///+ GC_MACRO_SECURITY_LEVEL
 Global Const GC_MACRO_SECURITY_LEVEL_VERYHIGH = 3  '///+ GC_MACRO_SECURITY_LEVEL_VERYHIGH: Symbolic name for very high macro security
 Global Const GC_MACRO_SECURITY_LEVEL_DEFAULT  = 2  '///+ GC_MACRO_SECURITY_LEVEL_DEFAULT:  Symbolic name for default macro security level
 
+'///* Extensions
+Global gExtensionOOoImprovementIsInstalled as boolean
+
 sub OnlyForDocuGVariables
 '///<b>System for the installed Office</b>
 '///<i>gPlatform</i>: Operatingsystem (internal shortkey)
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index 71aad97a5520..460a48f3e06b 100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -707,6 +707,8 @@ sub mMakeGeneralOptionsAPI
     Dim xViewRoot
     Dim sTempList
     Dim bError as boolean
+
+    Dim oOOoImprovementController as object  ' Check presence of the OOo Improvement Extension
    
     sFileFunction="global::system::inc::master.inc::hMakeGeneralOptionsAPI:: "
 
@@ -819,6 +821,25 @@ sub mMakeGeneralOptionsAPI
         end if
         xViewRoot.dispose()
 
+        '///+ OOo Improvement Extension
+        ' Note: Logging is disabled the hard way. The UI will not notice the change so even if logging is disabled
+        '       the UI will claim that it is. You can verify the status manually though by performing some action
+        '       in the application and looking for the log file in user/temp/Feedback.
+        oOOoImprovementController = oUnoOfficeConnection.createInstance( "com.sun.star.oooimprovement.CoreController" )
+        if ( isNull( oOOoImprovementController ) ) then
+            gExtensionOOoImprovementIsInstalled = FALSE 
+        else
+            gExtensionOOoImprovementIsInstalled = TRUE
+            aPropertyValue(0).Value="/org.openoffice.Office.Logging/OOoImprovement"
+            xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue())
+            xViewRoot.replaceByName("EnablingAllowed", false)
+            xViewRoot.commitChanges()
+            if xViewRoot.hasPendingChanges() then
+                qaErrorLog("Configuration not flushed: OOoImprovementProgram/InvitationAccepted: FALSE")
+            end if
+            xViewRoot.dispose()
+        endif
+
         '///+<li>Setting the <i>work</i> directory in Tools / Options,
         sTempPath = ConvertPath (gOfficePath + "user\work")
         '///+<li>If the temp-path does not exist it will be created. 
@@ -863,6 +884,7 @@ sub mMakeGeneralOptionsAPI
         '///Check which 'Macro Security Level' is set and put it into <i>gMacroSecurityLevel</i> variable. 
         gMacroSecurityLevel = fGetSetMacroSecurityUNO()
 
+
     catch
         ExceptLog
         MsgBox (sFileFunction + "The test did not start correctly or the application has been crashed." & Chr(13) & _
@@ -1086,7 +1108,7 @@ sub sStartUpOffice (optional sProfPath as String, optional sProfParameter as Str
     '///+ <li><i>-autocrashreport</i> to enable the non-GUI crash report functionality</li>
     '///+ <li><i>-accept=socket,host=localhost,port=12345;urp</i> to enable UNO connection</li>
     '///+ <li><i>OPTIONAL application parameters</i> for profiling tests</li>    
-    sParameter = "-enableautomation -norestore -nolockcheck -autocrashreport " & sUnoPort & sAppParameter & " "
+    sParameter = "-enableautomation -norestore -nolockcheck -autocrashreport -nofirststartwizard " & sUnoPort & sAppParameter & " "
     if IsMissing (sProfPath) then
         '///+ <li><i>Factory</i>-parameter which depends on the value of <b>gApplication</b> (WRITER, CALC, ...)</li></ol>
         sParameter = sParameter & sFactory
diff --git a/testautomation/global/tools/includes/required/t_option.inc b/testautomation/global/tools/includes/required/t_option.inc
index a23c19afeb1d..2de122dc747c 100755
--- a/testautomation/global/tools/includes/required/t_option.inc
+++ b/testautomation/global/tools/includes/required/t_option.inc
@@ -226,6 +226,11 @@ function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIO
                               bFirst = FALSE
                               Kontext "TabOnlineUpdate"
                               If TabOnlineUpdate.exists(2) then bCorPage = TRUE
+                      case "IMPROVEMENT"
+                              if bFirst = TRUE then Optionsliste.Select ( startpos + 14 )
+                              bFirst = FALSE
+                              Kontext "TabOOoImprovement"
+                              If TabOOoImprovement.exists(2) then bCorPage = TRUE 
                       case else :  bCorPage = FALSE
                 end select
             case "LOADSAVE"
diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win
index bc619d032f28..66ce34a2c5a6 100755
--- a/testautomation/global/win/etab_h_o.win
+++ b/testautomation/global/win/etab_h_o.win
@@ -11,6 +11,11 @@ URL sfx2:Edit:TP_DOCINFORELOAD:ED_URL
 BrowseURL sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL
 Frame sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME
 
+*TabOOoImprovement svx:TabPage:RID_SVXPAGE_IMPROVEMENT
+ParticipateYes svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES
+ParticipateNo svx:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO
+ShowData svx:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA
+
 *TabJava HID_OPTIONS_JAVA
 UseJava svx:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE
 JavaList HID_OPTIONS_JAVA_LIST