CWS-TOOLING: integrate CWS frmdlg

2008-12-18 09:13:09 +0100 oj  r265667 : merge from odff05
2008-12-18 07:58:16 +0100 oj  r265658 : #i94555# patch from <regina>, ODFF:
Add GAMMA, CHISQDIST, CHISQINV.
Make the 'cumulative' parameter of GAMMADIST optional.
Adapt the domain of CHIDIST to allow negative x.
Remove the constraint "degrees of freedom < 1.0E5" from CHIDIST and CHIINV.
Plus a mechanism to write the now optional parameter of GAMMADIST to PODF and
ODFF if omitted, for backwards compatibility.
2008-12-15 14:06:11 +0100 oj  r265490 : CWS-TOOLING: rebase CWS frmdlg to trunk@264807 (milestone: DEV300:m37)
2008-12-15 13:55:28 +0100 oj  r265488 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 13:55:07 +0100 oj  r265487 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 13:54:48 +0100 oj  r265486 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 13:54:36 +0100 oj  r265485 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 13:54:24 +0100 oj  r265484 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 13:48:11 +0100 oj  r265483 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 13:31:12 +0100 oj  r265479 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 13:13:58 +0100 oj  r265477 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 13:10:09 +0100 oj  r265476 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 13:05:11 +0100 oj  r265475 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 10:47:17 +0100 oj  r265467 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 10:46:19 +0100 oj  r265466 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 10:45:47 +0100 oj  r265465 : CWS-TOOLING: do not delete this file, it's needed for 'cws rebase -C'
CWS: frmdlg
New MWS: DEV300
New milestone: m37
2008-12-15 07:35:07 +0100 oj  r265458 : add dependency to formula
2008-12-15 07:34:24 +0100 oj  r265457 : add dependency to formula
2008-12-12 13:22:00 +0100 msc  r265413 : #i97089#
2008-12-12 13:20:25 +0100 msc  r265412 : #i97089#
2008-12-12 12:35:12 +0100 msc  r265406 : #i97089#
2008-12-12 12:34:16 +0100 msc  r265405 : #i97089#
2008-12-12 12:33:05 +0100 msc  r265404 : #i97089#
2008-12-12 12:31:11 +0100 msc  r265403 : #i97089#
2008-12-08 11:59:10 +0100 oj  r264981 : insert RTL_LOG
2008-12-08 11:50:17 +0100 oj  r264980 : some small changes
2008-12-05 12:57:57 +0100 oj  r264902 : eof changed
2008-12-05 12:56:46 +0100 oj  r264901 : eof changed
2008-12-05 12:28:47 +0100 oj  r264899 : wrong var used
2008-12-05 10:08:57 +0100 oj  r264890 : token order reversed
2008-12-04 13:49:22 +0100 oc  r264843 : #i96688: Adapt autotests because of outsourced functionwizard
2008-12-04 13:45:27 +0100 oc  r264842 : #i96688: Adapt autotests because of outsourced functionwizard
2008-12-04 13:42:54 +0100 oc  r264841 : #i96688: Adapt autotests because of outsourced functionwizard
2008-12-04 13:37:41 +0100 oc  r264840 : #i96688: Adapt autotests because of outsourced functionwizard
2008-12-04 13:34:11 +0100 oc  r264839 : #i96688: Adapt autotests because of outsourced functionwizard
2008-12-04 12:35:31 +0100 oj  r264835 : new help ids for struct and function tabpage
2008-12-04 12:00:35 +0100 oj  r264828 : set explicit help id
2008-12-03 14:53:27 +0100 oj  r264786 : #i96845# change ref button
2008-12-03 14:51:49 +0100 oj  r264785 : #i96845# change ref button
2008-12-03 08:51:57 +0100 oj  r264746 : convert dos to unix lineends
2008-12-03 08:50:45 +0100 oj  r264745 : convert dos to unix lineends
2008-12-03 08:50:05 +0100 oj  r264744 : convert dos to unix lineends
2008-12-02 12:28:33 +0100 oj  r264686 : clear help text when new helpid is set
2008-12-02 12:28:02 +0100 oj  r264685 : set help id for listbox category
2008-12-02 07:15:56 +0100 oj  r264655 : remove define to auto generate help ids
2008-12-01 14:36:43 +0100 oj  r264604 : use temp var
2008-12-01 14:18:31 +0100 oj  r264601 : moved ScJumpToken to formula
2008-12-01 14:18:11 +0100 oj  r264600 : moved ScJumpToken to formula
2008-12-01 14:14:35 +0100 oj  r264599 : moved ScJumpToken from sc
2008-12-01 10:48:51 +0100 oj  r264589 : change quickhelptext from Shrink to Select
2008-12-01 10:28:41 +0100 oj  r264588 : fix opcode data, has to be Any.Void
2008-11-28 11:16:48 +0100 oj  r264532 : add help ids
2008-11-28 10:16:56 +0100 oj  r264529 : set help id
2008-11-28 10:16:43 +0100 oj  r264528 : set help id
2008-11-26 13:55:04 +0100 oj  r264381 : #94535# use of optional instead of deleting a string myself and some small changes
2008-11-26 09:53:20 +0100 oj  r264346 : compile error with debug/without debug
2008-11-25 07:41:28 +0100 oj  r264271 : put static into the method which make use of them
2008-11-24 08:16:07 +0100 oj  r264196 : removed not needed classes for op code
2008-11-24 08:13:44 +0100 oj  r264195 : removed not needed classes for op code
2008-11-21 14:05:53 +0100 oj  r264135 : make GetOpCode inline
2008-11-21 12:35:27 +0100 oj  r264124 : hold symbols
2008-11-20 09:27:27 +0100 oj  r264028 : merged code from DEV300_m35 which got lost
2008-11-19 20:42:12 +0100 oj  r264022 : more changes for formula dialog remove
2008-11-19 20:37:41 +0100 oj  r264021 : removed unused var
2008-11-19 20:35:35 +0100 oj  r264020 : some more changes at token
2008-11-19 10:59:47 +0100 oj  r263967 : deleted
2008-11-19 10:58:24 +0100 oj  r263966 : add forui and for res files
2008-11-18 15:27:36 +0100 oj  r263777 : unused para removed
2008-11-18 15:23:23 +0100 oj  r263775 : add insert button to add field dlg
2008-11-18 13:39:53 +0100 oj  r263764 : enable the formula dialog as well for conditional print as for conditional formatting
2008-11-18 12:03:25 +0100 oj  r263760 : rename isRef in IsRef
2008-11-17 11:46:16 +0100 oj  r263711 : patches for function handling
2008-11-17 11:36:22 +0100 oj  r263710 : add new for forui and res file
2008-11-17 09:21:12 +0100 oj  r263704 : patches for some resource for libformula
2008-11-15 12:45:30 +0100 oj  r263701 : changes for formula editor extraction
2008-11-07 08:23:27 +0100 oj  r263416 : merge from DEV300:m35
2008-11-07 08:22:35 +0100 oj  r263415 : merge from DEV300:m35
2008-11-07 08:22:16 +0100 oj  r263414 : merge from DEV300:m35
2008-11-07 08:21:41 +0100 oj  r263413 : merge from DEV300:m35
2008-11-07 08:21:31 +0100 oj  r263412 : merge from DEV300:m35
2008-11-07 08:20:38 +0100 oj  r263411 : merge from DEV300:m35
2008-11-07 08:20:00 +0100 oj  r263410 : merge from DEV300:m35
2008-11-07 08:18:50 +0100 oj  r263409 : merge from DEV300:m35
2008-11-07 08:18:19 +0100 oj  r263408 : merge from DEV300:m35
2008-11-07 08:10:27 +0100 oj  r263407 : merge from DEV300:m35
2008-10-21 07:43:46 +0200 oj  r262560 : some compile errors resolved
2008-10-17 16:40:01 +0200 oj  r262291 : dep for 1st target
2008-10-07 10:08:39 +0200 oj  r262077 : copy
2008-10-07 09:45:31 +0200 oj  r262076 : #i94535# 
2008-10-07 09:44:26 +0200 oj  r262075 : #i94535# new base class
2008-10-07 09:43:21 +0200 oj  r262074 : moved to formula
2008-10-07 09:41:51 +0200 oj  r262073 : new images
2008-10-07 09:03:01 +0200 oj  r262072 : new ids for formula
2008-10-02 08:46:27 +0200 oj  r262024 : #i94535# move the formula compiler to formula
2008-10-02 08:08:54 +0200 oj  r262023 : #i94535#
2008-10-02 08:06:28 +0200 oj  r262022 : #i94535#
2008-10-02 08:05:52 +0200 oj  r262021 : #i94535#
2008-10-01 17:15:29 +0200 oj  r262014 : #i94535#
2008-10-01 17:12:40 +0200 oj  r262013 : new module formula
2008-10-01 17:04:55 +0200 oj  r262012 : #i94535#
2008-10-01 16:49:03 +0200 oj  r262010 : #i94535#
2008-10-01 16:46:59 +0200 oj  r262009 : #i94535#

8 files changed, 311 insertions, 67 deletions

diff --git a/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas b/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas
new file mode 100755
index 000000000000..8f287012abf4
--- /dev/null
+++ b/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas
@@ -0,0 +1,65 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: dba_rpt_Grouping.bas,v $
+'*
+'* $Revision: 1.1 $
+'*
+'* last change: $Author: msc $ $Date: 2008-06-20 12:58:24 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org.  If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : marc.neumann@sun.com
+'*
+'* short description : Report Builder Function Wizard
+'*
+'\***********************************************************************
+sub main
+    
+    printlog "---------------------------------------------------------------------"
+    printlog "-----      D B A C C E S S  -  R E P O R T   B U I L D E R      -----"
+    printlog "---------------------------------------------------------------------"
+
+    use "dbaccess/optional/includes/rpt_FunctionWizard.inc"
+
+    call hStatusIn ("dbaccess" , "dba_rpt_FunctionWizard.bas")
+
+    if ( tools_reporttools_InstallExtension() = 0 ) then        
+        call rpt_FunctionWizard
+    else
+        warnlog "report extension could not installed"    
+    endif
+
+    call hStatusOut
+    
+end sub
+
+
+sub LoadIncludeFiles      
+   use "dbaccess/tools/dbinit.inc"   
+   Call sDBInit
+   Call GetUseFiles
+   gApplication   = "WRITER"
+end sub
diff --git a/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc b/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc
new file mode 100755
index 000000000000..04c4e832b987
--- /dev/null
+++ b/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc
@@ -0,0 +1,123 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: rpt_Grouping.inc,v $
+'*
+'* $Revision: 1.1 $
+'*
+'* last change: $Author: jsi $ $Date: 2008-06-16 07:43:42 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org.  If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : marc.neumann@sun.com
+'*
+'* short description : Function Wizard
+'*
+'\***********************************************************************************
+sub rpt_FunctionWizard
+
+    printlog "------------------ rpt_FunctionWizard.inc ---------------------"
+    
+    call tFunctionWizard
+    
+end sub
+'-------------------------------------------------------------------------
+'-------------------------------------------------------------------------
+'-------------------------------------------------------------------------
+testcase tFunctionWizard
+    
+    printlog "open Bibliography database"    
+    call fOpenDatabase(gOfficePath + ConvertPath("user/database/biblio.odb"))
+        
+    printlog "open the report designer"
+    call fOpenNewReportDesign
+
+    printlog "select the first table in the content list box"
+    Kontext "ReportDataProperties"   
+        Content.select 1
+        Content.typeKeys("<RETURN>",true) ' important to leave the listbox
+    
+    Kontext "ReportDesign"
+        ReportDesign.TypeKeys("<MOD1 TAB>",true)
+        ReportDesign.TypeKeys("<MOD1 TAB>",true)
+        
+    Kontext "ReportAddField"
+        ReportAddFieldList.select 1    
+        ReportAddField.TypeKeys("<RETURN>",true)        
+        
+    'close the Add Field dialog to get the focus back to the design
+    call fCloseAddFieldDialog()
+    
+    'press 2 time tab to select the edit field
+    Kontext "ReportDesign"
+        ReportDesign.TypeKeys("<TAB>",true)
+        ReportDesign.TypeKeys("<TAB>",true)
+    
+    sleep(1)
+    
+    printlog "click on the ... button behind the datafield property in the property browser"    
+    Kontext "ReportDataProperties"
+        OpenFormularWizard.Click
+    
+    printlog "check if the function wizard appear"    
+    Kontext "FunctionWizard"
+        if(FunctionWizard.exists(5)) then
+            printlog "The function wizard appear -> OK"
+            
+            CategoryLB.select(5)
+            sleep(1)            
+            FunctionLB.select(6)
+            sleep(1)
+            NextBt.Click
+            sleep(1)
+            Editfield1.setText("""12/18/2008""")
+            sleep(1)
+            
+            FunctionWizard.OK
+        else
+            warnlog "The function wizard does not appear -> FAILED"
+        endif
+    
+    call fExecuteReport
+        
+    sleep(10)
+    
+    '/// check if the report is created
+    printlog "check if the report is created"
+    Kontext "DocumentWriter"
+        if (DocumentWriter.exists(10)) then            
+            call fCloseReportView
+        else
+            warnlog "No report is created."
+        endif
+        
+    printlog "close the report designer"
+    call fCloseReportDesign
+    printlog "close the database"
+    call fCloseDatabase
+
+endcase
+'-------------------------------------------------------------------------
+
diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
index 2f50af593df0..3dd8dd2edacd 100755
--- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc
+++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
@@ -51,7 +51,8 @@ sub rpt_Main
         call tGroupingSorting
         call tReportNavigator
         call tReportHeaderFooter
-        call tPageHeaderFooter        
+        call tPageHeaderFooter   
+        call tFunctionWizard
     else
         warnlog "report extension could not installed"    
     endif
@@ -821,3 +822,56 @@ testcase tFormatPage
     call fCloseDatabase
 
 endcase
+'-------------------------------------------------------------------------
+testcase tFunctionWizard
+    
+    printlog "open Bibliography database"    
+    call fOpenDatabase(gOfficePath + ConvertPath("user/database/biblio.odb"))
+        
+    printlog "open the report designer"
+    call fOpenNewReportDesign
+
+    printlog "select the first table in the content list box"
+    Kontext "ReportDataProperties"   
+        Content.select 1
+        Content.typeKeys("<RETURN>",true) ' important to leave the listbox
+    
+    Kontext "ReportDesign"
+        ReportDesign.TypeKeys("<MOD1 TAB>",true)
+        ReportDesign.TypeKeys("<MOD1 TAB>",true)
+        
+    Kontext "ReportAddField"
+        ReportAddFieldList.select 1    
+        ReportAddField.TypeKeys("<RETURN>",true)        
+        
+    'close the Add Field dialog to get the focus back to the design
+    call fCloseAddFieldDialog()
+    
+    'press 2 time tab to select the edit field
+    Kontext "ReportDesign"
+        ReportDesign.TypeKeys("<TAB>",true)
+        ReportDesign.TypeKeys("<TAB>",true)
+    
+    sleep(1)
+    
+    printlog "click on the ... button behind the datafield property in the property browser"    
+    Kontext "ReportDataProperties"
+        OpenFormularWizard.Click
+    
+    printlog "check if the function wizard appear"    
+    Kontext "FunctionWizard"
+        if(FunctionWizard.exists(5)) then
+            printloig "The function wizard appear -> OK"
+            FunctionWizard.close
+        else
+            warnlog "The function wizard does not appear -> FAILED"
+        endif
+    
+    sleep(1)        
+        
+    printlog "close the report designer"
+    call fCloseReportDesign
+    printlog "close the database"
+    call fCloseDatabase
+
+endcase
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index 64297733931b..59013a7408ef 100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -452,32 +452,6 @@ FormListe sw:ListBox:DLG_NUM_NAMES:LB_FORM
 *FormularNavigator SID_FM_SHOW_FMEXPLORER
 Liste HID_FORM_NAVIGATOR
 
-*Funktionsautopilot HID_SCDLG_FORMULA
-FunktionsautopilotTabControl SC:TABCONTROL:RID_SCDLG_FORMULA:TC_FUNCTION
-TabFunktionsautopilotFunktionen SC:TABPAGE:RID_SCTAB_FUNCTION
-Kategorie SC:LISTBOX:RID_SCTAB_FUNCTION:LB_CATEGORY
-Funktion SC:LISTBOX:RID_SCTAB_FUNCTION:LB_FUNCTION
-TabFunktion HID_SC_FAP_PAGE
-Funktionsbutton1 HID_SC_FAP_BTN_FX1
-Editfeld1 HID_SC_FAP_EDIT1
-Verkleinern1 HID_SC_FAP_BTN_REF1
-Maximizer sc:ImageButton:RID_SCDLG_FORMULA:RB_REF
-Funktionsbutton2 HID_SC_FAP_BTN_FX2
-Editfeld2 HID_SC_FAP_EDIT2
-Verkleinern2 HID_SC_FAP_BTN_REF2
-Funktionsbutton3 HID_SC_FAP_BTN_FX3
-Editfeld3 HID_SC_FAP_EDIT3
-Verkleinern3 HID_SC_FAP_BTN_REF3
-Funktionsbutton4 HID_SC_FAP_BTN_FX4
-Editfeld4 HID_SC_FAP_EDIT4
-Verkleinern4 HID_SC_FAP_BTN_REF4
-TabFunktionsautopilotStruktur SC:TABPAGE:RID_SCTAB_STRUCT
-Struktur HID_SC_FAP_STRUCT
-Formel HID_SC_FAP_FORMULA SC:MULTILINEEDIT:RID_SCDLG_FORMULA:ED_FORMULA
-Matrix sc:CheckBox:RID_SCDLG_FORMULA:BTN_MATRIX
-Zurueck sc:PushButton:RID_SCDLG_FORMULA:BTN_BACKWARD
-Weiter sc:PushButton:RID_SCDLG_FORMULA:BTN_FORWARD
-
 *FussnoteBearbeiten FN_EDIT_FOOTNOTE
 Automatisch sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO
 Zeichen sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index c3f65914de3b..4d0079f1f021 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -358,6 +358,33 @@ FunctionInsert sc:ImageButton:FID_FUNCTION_BOX:IMB_INSERT
 Category sc:ListBox:FID_FUNCTION_BOX:CB_CAT
 FunctionList sc:ListBox:FID_FUNCTION_BOX:LB_FUNC
 
+*FunctionWizard HID_FORMULADLG_FORMULA
+FunctionWizardTabControl formula:TabControl:RID_FORMULADLG_FORMULA:TC_FUNCTION
+TabFunctionWizardFormula HID_FORMULA_FAP_FORMULA
+CategoryLB HID_FORMULA_LB_CATEGORY
+FunctionLB HID_FORMULA_LB_FUNCTION
+TabFunktion HID_FORMULATAB_FUNCTION
+Functionsbutton1 HID_FORMULA_FAP_BTN_FX1
+Editfield1 HID_FORMULA_FAP_EDIT1
+Shrink1 HID_FORMULA_FAP_BTN_REF1
+Maximize formula:ImageButton:RID_FORMULADLG_FORMULA:RB_REF
+Functionsbutton2 HID_FORMULA_FAP_BTN_FX2
+Editfield2 HID_FORMULA_FAP_EDIT2
+Shrink2 HID_FORMULA_FAP_BTN_REF2
+Functionsbutton3 HID_FORMULA_FAP_BTN_FX3
+Editfield3 HID_FORMULA_FAP_EDIT3
+Shrink3 HID_FORMULA_FAP_BTN_REF3
+Functionsbutton4 HID_FORMULA_FAP_BTN_FX4
+Editfield4 HID_FORMULA_FAP_EDIT4
+Shrink4 HID_FORMULA_FAP_BTN_REF4
+TabFunctionWizardStructure HID_FORMULATAB_STRUCT
+Structure HID_FORMULA_FAP_STRUCT
+Formel HID_FORMULA_FAP_FORMULA
+Matrix formula:CheckBox:RID_FORMULADLG_FORMULA:BTN_MATRIX
+Backward formula:PushButton:RID_FORMULADLG_FORMULA:BTN_BACKWARD
+Forward formula:PushButton:RID_FORMULADLG_FORMULA:BTN_FORWARD
+NextBt formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_FORWARD
+
 *FTPConnection HID_FTP
 ServerName HID_FTP_SERVER
 UserName HID_FTP_USERNAME
diff --git a/testautomation/global/win/reportdesigner.win b/testautomation/global/win/reportdesigner.win
index 35e2bca41190..4bf7e9ad1280 100755
--- a/testautomation/global/win/reportdesigner.win
+++ b/testautomation/global/win/reportdesigner.win
@@ -74,6 +74,7 @@ AnalyzeSQLCommand           HID_PROP_ESCAPE_PROCESSING
 Filter                      HID_PROP_FILTER_CRITERIA
 FilterDLGButton             UID_PROP_DLG_FILTER
 DataField                   HID_RPT_PROP_DATAFIELD
+OpenFormularWizard           UID_RPT_PROP_FORMULA
 
 *ReportPropertiesTabControl  HID_FM_PROPDLG_TABCTR
 ReportGeneralProperties      HID_RPT_PROPDLG_TAB_GENERAL
diff --git a/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc b/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc
index b25e539bce26..3d7191f20fc8 100755
--- a/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc
+++ b/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc
@@ -70,58 +70,58 @@ testcase tgetpivotdata_function_wizard
     printlog "Select cell I8 and open function wizard by INSERT FUNCTION"
     call fGotoCell ( "I8" )
     InsertFunction
-    kontext ( "FunktionsAutoPilot" )
+    kontext ( "FunctionWizard" )
     '/// Select category SPREADSHEET (11th category in listbox)
     printlog "Select category SPREADSHEET (11th category in listbox)"
-    Kategorie.select 11
+    CategoryLB.select 11
     '/// Select the function GETPIVOTDATA in the now filtered function list
     printlog "Select the function GETPIVOTDATA in the now filtered function list"
     try 
-        Funktion.select sfunctionname
+        FunctionLB.select sfunctionname
         printlog "  Function " & sfunctionname & " selected in category SPREADSHEET"
     catch
         warnlog "The function is not available under category SPREADSHEET"
     endcatch
-    Kategorie.select 2
+    CategoryLB.select 2
     try
-        Funktion.select sfunctionname
+        FunctionLB.select sfunctionname
     catch
         warnlog "The function is generally not available"
-        FunktionsAutoPilot.OK
+        FunctionWizard.OK
         call hCloseDocument
         goto endsub
     endcatch
     '/// Press NEXT button
     printlog "Press NEXT button"
-    weiter.click
+    Forward.click
     '/// Enter 2000 for parameter Data Field
     printlog "Enter 2000 for parameter Data Field"
-    kontext "FunktionsAutoPilot"
-    Editfeld1.settext "2000"
+    kontext "FunctionWizard"
+    Editfield1.settext "2000"
     '/// Enter C29 for parameter DataPilot
     printlog "Enter C29 for parameter DataPilot"
-    Editfeld2.settext "C29"
+    Editfield2.settext "C29"
     '/// Enter C3 for parameter Field Name / Item 1
     printlog "Enter C3 for parameter Field Name / Item 1"
-    Editfeld3.settext "C3"
+    Editfield3.settext "C3"
     '/// Enter C16 for parameter Field Name / Item 2
     printlog "Enter C16 for parameter Field Name / Item 2"
-    Editfeld4.settext "C16"
+    Editfield4.settext "C16"
     '/// Scroll down to enable the next field
     printlog "Scroll down to enable the next field"
-    Editfeld4.TypeKeys "<DOWN>"
+    Editfield4.TypeKeys "<DOWN>"
     '/// Enter C26 for parameter Field Name / Item 3
     printlog "Enter C26 for parameter Field Name / Item 3"
-    Editfeld4.settext "C26"
+    Editfield4.settext "C26"
     '/// Scroll down to enable the next field
     printlog "Scroll down to enable the next field"
-    Editfeld4.TypeKeys "<DOWN>"
+    Editfield4.TypeKeys "<DOWN>"
     '/// Enter F27 for parameter Field Name / Item 4
     printlog "Enter F27 for parameter Field Name / Item 4"
-    Editfeld4.settext "F27"
+    Editfield4.settext "F27"
     '/// Close functionwizard by pressing OK button
     printlog "Close functionwizard by pressing OK button"
-    FunktionsAutoPilot.OK
+    FunctionWizard.OK
     '/// Memorize cellcontent
     kontext ( "RechenleisteCalc" ) 
     EingabeZeileCalc.TypeKeys ("<f2><mod1 a>")
diff --git a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc
index 1a4d7c7a53a1..fb966ff7ecb3 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc
@@ -552,27 +552,27 @@ testcase tInsertFunction
     '/// Open the 'Function Wizard' via 'Insert – Function'
     printlog " Open the 'Function Wizard' via 'Insert – Function'"
     InsertFunction
-    Kontext "Funktionsautopilot"
+    Kontext "FunctionWizard"
     '/// Check that there are 13 entries in the category listbox
     printlog " Check that there are 13 entries in the category listbox"
-    if Kategorie.GetItemCount <> 13 then
-        warnlog "There are " &  Kategorie.GetItemCount & " categories instead of 13"
+    if CategoryLB.GetItemCount <> 13 then
+        warnlog "There are " &  CategoryLB.GetItemCount & " categories instead of 13"
     end if
     '/// Choose the second entry (all) in the category listbox
     printlog " Choose the second entry (all) in the category listbox"
-    Kategorie.Select(2)
+    CategoryLB.Select(2)
     '/// Choose all entries in the function list and click 'Next' button
     printlog " Choose all entries in the function list"
-    ifunctionCount = Funktion.getItemCount      
+    ifunctionCount = FunctionLB.getItemCount      
     for ifunctionIndex = 1 To ifunctionCount
-        Kategorie.Select(2)
-        Funktion.Select(ifunctionIndex)
+        CategoryLB.Select(2)
+        FunctionLB.Select(ifunctionIndex)
 '        sleep(1)
-        printlog Funktion.GetSelText
-        call DialogTest ( Funktionsautopilot,ifunctionIndex )
+        printlog FunctionLB.GetSelText
+        call DialogTest ( FunctionWizard,ifunctionIndex )
         '/// Click on 'Next' – button
-        Weiter.Click
-        call DialogTest ( Funktionsautopilot,(ifunctionCount + ifunctionIndex) )
+        Forward.Click
+        call DialogTest ( FunctionWizard,(ifunctionCount + ifunctionIndex) )
         Formel.typekeys "<MOD1 A><DELETE>", true
     next ifunctionIndex
     '/// Check option 'Array'
@@ -580,34 +580,34 @@ testcase tInsertFunction
     Matrix.check
     '/// Choose the third entry (database) in the category listbox
     printlog " Choose the third entry (database) in the category listbox"
-    Kategorie.Select(3)
+    CategoryLB.Select(3)
     '/// Choose first function
     printlog " Choose first function"
-    Funktion.Select (1)
+    FunctionLB.Select (1)
     '/// Click on 'Next' button
     printlog " Click on 'Next' button"
-    Weiter.Click
+    Forward.Click
     '/// Click on 'Shrink' – button; the range chooser appears
     printlog " Click on 'Shrink' – button; the range chooser appears"
-    Verkleinern1.click
+    Shrink1.click
     '/// Enter 'A1' in rangechooser
     printlog " Enter 'A1' in rangechooser"
-    Editfeld1.SetText ("A1")    
+    Editfield1.SetText ("A1")    
     '/// Click on 'Maximize' – button
     printlog " Click on 'Maximize' – button"
-    maximizer.click
+    maximize.click
     '/// Click on 'fx' – button
     printlog " Click on 'fx' – button"
-    Funktionsbutton1.click
+    Functionsbutton1.click
     '/// Switch to tabpage 'Structure'
     printlog " Switch to tabpage 'Structure'"
-    Kontext "FunktionsautopilotTabControl"
-    FunktionsautopilotTabControl.setpage TabFunktionsautopilotStruktur
-    Kontext "Funktionsautopilot"
-    call DialogTest ( Funktionsautopilot,((ifunctionCount *2)+1) )
+    Kontext "FunctionWizardTabControl"
+    FunctionWizardTabControl.setpage TabFunctionWizardStructure
+    Kontext "FunctionWizard"
+    call DialogTest ( FunctionWizard,((ifunctionCount *2)+1) )
     '/// Close dialog with 'Cancel'
     printlog " Close dialog with 'Cancel'"
-    Funktionsautopilot.Cancel
+    FunctionWizard.Cancel
     '/// Close document
     printlog " Close starting document"
     call hCloseDocument