CWS-TOOLING: integrate CWS rtlchart01

6 files changed, 558 insertions, 38 deletions

diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas
index 1a260734d0ee..2ad13a4d141a 100755
--- a/testautomation/chart2/required/ch2_updt_calc.bas
+++ b/testautomation/chart2/required/ch2_updt_calc.bas
@@ -51,6 +51,7 @@ sub main
     use "chart2\required\includes\ch2_wizard.inc"
     use "chart2\required\includes\ch2_file.inc"
     use "chart2\required\includes\ch2_view.inc"
+    use "chart2\required\includes\ch2_insert_ctl.inc"
     use "chart2\required\includes\ch2_insert.inc"
     use "chart2\required\includes\ch2_format.inc"
     use "chart2\required\includes\ch2_format1.inc"
@@ -92,7 +93,14 @@ sub main
         call tInsertTrendLines
         call tInsertMeanValueLines
         call tInsertYErrorBars
-        call tInsertSpecialCharacter        
+        call tInsertSpecialCharacter
+        printLog Chr(13) + "-------- Chart2 CTL Features  ----------"
+        call tTitleTextDirection
+        call tLegendTextDirection
+        call tXAxisTextDirection
+        call tDataSeriesTextDirection
+        call tEquationTextDirection
+        call tDataPointTextDirection
         printlog Chr(13) + "---------  Chart2 Format Menu  ---------"
         call tFormatObjectProperties
         call tFormatObjectPropertiesPieChart
diff --git a/testautomation/chart2/required/includes/ch2_insert_ctl.inc b/testautomation/chart2/required/includes/ch2_insert_ctl.inc
new file mode 100644
index 000000000000..b8c843a99dac
--- /dev/null
+++ b/testautomation/chart2/required/includes/ch2_insert_ctl.inc
@@ -0,0 +1,496 @@
+'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: ch2_insert_ctl.inc,v $
+'*
+'* $Revision: 1.1.2.2 $
+'*
+'* last change: $Author: jsi $ $Date: 2008/11/12 15:01:38 $
+'*
+'* 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 : joerg.sievers@sun.com
+'*
+'* short description : Chart resource test - CTL features
+'*
+'************************************************************************
+'*
+' #1 tTitleTextDirection
+' #1 tLegendTextDirection
+' #1 tXAxisTextDirection
+' #1 tDataSeriesTextDirection
+' #1 tEquationTextDirection
+' #1 tDataPointTextDirection
+' #0 sValidateTextDirection
+'*
+'\************************************************************************
+
+testcase tTitleTextDirection    
+    Dim bCTLSupBefore as boolean
+        
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    else
+        printlog "Load test document and save it local as ../user/work/verySimpleChart.ods"    
+    endif
+    printlog "Enable the complex text layout (CTL) support under Tools / Options / Language Settings / Languages / Enhanced language support"
+    bCTLSupBefore = ActiveDeactivateCTLSupport(TRUE)     
+    printlog "Select the first OLE object in the document."
+    call fSelectFirstOLE
+    printlog "Edit / Object / Edit"    
+    EditObjectEdit       
+    Kontext "DocumentChart"
+    printlog "Type in the Chart document <TAB>"
+    DocumentChart.TypeKeys "<TAB>"
+    printlog "Format / Object properties"
+    FormatObjectProperties
+    Kontext
+    printlog "Select the tab page alignment"    
+    Active.SetPage TabFormatChartTitleAlignment
+    Kontext "TabFormatChartTitleAlignment"
+    call DialogTest(TabFormatChartTitleAlignment)
+    sValidateTextDirection(TextDirection)
+    TabFormatChartTitleAlignment.Cancel
+    printlog "Leave the tab page dialog with Cancel"
+    if bCTLSupBefore <> gCTLSup then
+        Call ActiveDeactivateCTLSupport(bCTLSupBefore)
+        printlog "Reset the state of CTL support to the default before this test case has been executed"
+    endif
+    printlog "File / Close"
+    Call hCloseDocument
+endcase
+'
+'-------------------------------------------------------------------------
+'
+testcase tLegendTextDirection
+    Dim bCTLSupBefore as boolean
+    
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    else
+        printlog "Load test document and save it local as ../user/work/verySimpleChart.ods"    
+    endif
+    printlog "Enable the complex text layout (CTL) support under Tools / Options / Language Settings / Languages / Enhanced language support"
+    bCTLSupBefore = ActiveDeactivateCTLSupport(TRUE)
+    call fSelectFirstOLE
+    printlog "Select the first OLE object"
+    EditObjectEdit
+    printlog "Edit / Object Edit"
+    printlog "Format / Legend"
+    FormatLegend
+    Kontext
+    printlog "Select the tab page Position"
+    Active.SetPage TabLegendPosition  
+    Kontext "TabLegendPosition"    
+    call DialogTest(TabLegendPosition)
+    sValidateTextDirection(TextDirection)
+    TabLegendPosition.Cancel
+    if bCTLSupBefore <> gCTLSup then
+        Call ActiveDeactivateCTLSupport(bCTLSupBefore)
+        printlog "Reset the state of CTL support to the default before this test case has been executed"
+    endif
+    printlog "File / Close"
+    Call hCloseDocument
+endcase
+'
+'-------------------------------------------------------------------------
+'
+testcase tXAxisTextDirection
+    Dim bCTLSupBefore as boolean
+
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    else
+        printlog "Load test document and save it local as ../user/work/verySimpleChart.ods"    
+    endif
+    printlog "Enable the complex text layout (CTL) support under Tools / Options / Language Settings / Languages / Enhanced language support"
+    bCTLSupBefore = ActiveDeactivateCTLSupport(TRUE)
+    printlog "Select the first OLE object"
+    call fSelectFirstOLE    
+    printlog "Edit / Object Edit"
+    EditObjectEdit
+    printlog "Format / Axis / X Axis"    
+    FormatAxisXAxis   
+    Kontext
+    printlog "Select the tab page Label"
+    Active.SetPage TabChartAxisLabel
+    Kontext "TabChartAxisLabel"
+    call DialogTest(TabChartAxisLabel)    
+    sValidateTextDirection(TextDirection)    
+    TabChartAxisLabel.Cancel
+    printlog "Leave the tab dialog with Cancel"
+    if bCTLSupBefore <> gCTLSup then
+        Call ActiveDeactivateCTLSupport(bCTLSupBefore)
+        printlog "Reset the state of CTL support to the default before this test case has been executed"
+    endif
+    printlog "File / Close"
+    Call hCloseDocument
+endcase
+'
+'-------------------------------------------------------------------------
+'
+testcase tDataSeriesTextDirection
+    Dim bCTLSupBefore as boolean
+    Dim oControlToCheck as object
+    Dim oControlToCheck2 as object
+    Dim oControlToCheck3 as object
+    Dim iCombination as integer
+    Dim sText as string
+
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    else
+        printlog "Load test document and save it local as ../user/work/verySimpleChart.ods"    
+    endif
+    printlog "Enable the complex text layout (CTL) support under Tools / Options / Language Settings / Languages / Enhanced language support"
+    bCTLSupBefore = ActiveDeactivateCTLSupport(TRUE)
+    call fSelectFirstOLE
+    printlog "Select the first OLE object"
+    EditObjectEdit
+    printlog "Edit / Object Edit"
+    Kontext "DocumentChart"
+    printlog "Type thrice in the Chart document <TAB>"
+    DocumentChart.TypeKeys "<TAB>" , 3
+    printlog "Format / Object properties"
+    FormatObjectProperties
+    Kontext
+    Active.Setpage TabDataSeriesLabels
+    Kontext "TabDataSeriesLabels"    
+    for iCombination = 1 to 7
+        select case iCombination
+            'Check-box combinations with 1, 2 or 3 enabled check-boxes.
+            case 1      :   oControlToCheck = ShowValue
+                            sText = "Show value as number"
+            case 2      :   oControlToCheck = AsPercentage
+                            sText = "Show value as percentage"
+            case 3      :   oControlToCheck = ShowLabelText
+                            sText = "Show category"
+            
+            case 4      :   oControlToCheck = ShowValue
+                            oControlToCheck2 = AsPercentage
+                            sText = "Show value as number and Show value as percentage"
+            case 5      :   oControlToCheck = ShowValue
+                            oControlToCheck2 = ShowLabelText
+                            sText = "Show value as number Show category"
+            case 6      :   oControlToCheck2 = AsPercentage
+                            oControlToCheck2 = ShowLabelText
+                            sText = "Show value as percentage and Show category"
+            
+            case 7      :   oControlToCheck = ShowValue
+                            oControlToCheck2 = AsPercentage
+                            oControlToCheck3 = ShowLabelText
+                            sText = "Show value as number and Show value as percentage and Show category"  
+                            
+            case else   :   warnlog "Wrong combination entered. Exiting!"
+                            TabDataSeriesLabels.Cancel
+                            call hCloseDocument
+                            goto endsub
+        end select
+        'One checked check-box
+        if iCombination > 0 AND iCombination < 4 then
+            if fSetCheckBox(oControlToCheck, TRUE) > 0 then
+                warnlog "Setting check-box '" & sText & "' failed. Exiting test case"
+                TabDataSeriesLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            else
+                printlog "Check '" & sText & "' and check that text direction-list-box contains 3 entries."
+                sValidateTextDirection(TextDirection)
+            endif
+        endif
+        'Two checked check-boxes
+        if iCombination > 3 AND iCombination < 7 then
+            if fSetCheckBox(oControlToCheck, TRUE) > 0 AND fSetCheckBox(oControlToCheck2, TRUE) > 0 then
+                warnlog "Setting check-box '" & sText & "' failed. Exiting test case"
+                TabDataSeriesLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            else
+                printlog "Check '" & sText & "' and check that text direction-list-box contains 3 entries."
+                sValidateTextDirection(TextDirection)
+            endif
+            if fSetCheckBox(oControlToCheck2, FALSE) > 0 then
+                warnlog "Unchecking check-box '" & sText & "' failed. Exiting test case"
+                TabDataSeriesLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            endif            
+        endif
+        'Three checked check-boxes
+        if iCombination = 7 then
+            if fSetCheckBox(oControlToCheck, TRUE) > 0 AND fSetCheckBox(oControlToCheck2, TRUE) > 0 AND fSetCheckBox(oControlToCheck3, TRUE) > 0 then
+                warnlog "Setting check-box '" & sText & "' failed. Exiting test case"
+                TabDataSeriesLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            else
+                printlog "Check '" & sText & "' and check that text direction-list-box contains 3 entries."
+                sValidateTextDirection(TextDirection)
+            endif
+            if fSetCheckBox(oControlToCheck2, FALSE) > 0 then
+                warnlog "Unchecking check-box '" & sText & "' failed. Exiting test case"
+                TabDataSeriesLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            endif
+            if fSetCheckBox(oControlToCheck3, FALSE) > 0 then
+                warnlog "Unchecking check-box '" & sText & "' failed. Exiting test case"
+                TabDataSeriesLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            endif                                
+        end if
+        if fSetCheckBox(oControlToCheck, FALSE) > 0 then
+            warnlog "Unchecking check-box '" & sText & "' failed. Exiting test case"
+            TabDataSeriesLabels.Cancel
+            call hCloseDocument
+            goto endsub
+        endif
+    next iCombination            
+    TabDataSeriesLabels.Cancel
+    if bCTLSupBefore <> gCTLSup then
+        Call ActiveDeactivateCTLSupport(bCTLSupBefore)
+        printlog "Reset the state of CTL support to the default before this test case has been executed"
+    endif
+    printlog "File / Close"
+    Call hCloseDocument
+endcase
+'
+'-------------------------------------------------------------------------
+'
+testcase tEquationTextDirection
+    Dim bCTLSupBefore as boolean
+
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    else
+        printlog "Load test document and save it local as ../user/work/verySimpleChart.ods"    
+    endif
+    printlog "Enable the complex text layout (CTL) support under Tools / Options / Language Settings / Languages / Enhanced language support"
+    bCTLSupBefore = ActiveDeactivateCTLSupport(TRUE)
+    printlog "Select the first OLE object"
+    call fSelectFirstOLE    
+    printlog "Edit / Object Edit"
+    EditObjectEdit    
+    Kontext "DocumentChart"
+    printlog "Type thrice in the Chart document <TAB>"
+    DocumentChart.TypeKeys "<TAB>" , 3
+    printlog "Press F3-key to enter the data series."
+    DocumentChart.TypeKeys "<F3>"    
+    if fInvokeTrendLinesDialog() > 0 then
+        warnlog "Something went wrong trying to invoke Trend Lines dialog -> Check this out!"
+        Call hCloseDocument
+        goto endsub
+    endif   
+    Kontext "InsertTrendlinesDialog"
+    Call DialogTest(InsertTrendlinesDialog)
+    printlog "Select Linear radio-button"
+    Linear.Check
+    printlog "Check Show Equation check-box"
+    ShowEquation.Check
+    printlog "Leave the dialog with OK"
+    InsertTrendlinesDialog.OK
+    Kontext "DocumentChart"
+    printlog "Type thrice in the Chart document <TAB> to select the equation"
+    DocumentChart.TypeKeys "<TAB>" , 3
+    printlog "Format / Object properties"
+    FormatObjectProperties
+    Kontext 
+    printlog "Count the numbers of tab pages. It should be 7 in CTL mode."
+    if Active.GetPageCount <> 7 then
+        warnlog "The count of tab pages is not 7, it is " & Active.GetPageCount & "!"
+    endif
+    printlog "Select the Alignment tab page (only available in CTL mode!)"
+    Active.SetPage TabFormatChartTitleAlignment
+    Kontext "TabFormatChartTitleAlignment"
+    Call DialogTest(TabFormatChartTitleAlignment)
+    printlog "Check that the text direction list-box contains 3 entries."    
+    sValidateTextDirection(TextDirection2)
+    printlog "Leave the dialog with cancel"
+    TabFormatChartTitleAlignment.Cancel
+    if bCTLSupBefore <> gCTLSup then
+        Call ActiveDeactivateCTLSupport(bCTLSupBefore)
+        printlog "Reset the state of CTL support to the default before this test case has been executed"
+    endif
+    printlog "File / Close"
+    Call hCloseDocument
+endcase
+'
+'-------------------------------------------------------------------------
+'
+testcase tDataPointTextDirection
+    Dim bCTLSupBefore as boolean
+    Dim oControlToCheck as object
+    Dim oControlToCheck2 as object
+    Dim oControlToCheck3 as object
+    Dim iCombination as integer
+    Dim sText as string
+
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    else
+        printlog "Load test document and save it local as ../user/work/verySimpleChart.ods"    
+    endif
+    printlog "Enable the complex text layout (CTL) support under Tools / Options / Language Settings / Languages / Enhanced language support"
+    bCTLSupBefore = ActiveDeactivateCTLSupport(TRUE)
+    call fSelectFirstOLE
+    printlog "Select the first OLE object"
+    EditObjectEdit
+    printlog "Edit / Object Edit"
+    Kontext "DocumentChart"
+    printlog "Type thrice in the Chart document <TAB>"
+    DocumentChart.TypeKeys "<TAB>" , 3
+    printlog "Press F3-key to enter the data series."
+    DocumentChart.TypeKeys "<F3>"
+    printlog "Format / Object properties"
+    FormatObjectProperties
+    Kontext
+    Active.Setpage TabDataPointLabels
+    Kontext "TabDataPointLabels"    
+    for iCombination = 1 to 7
+        select case iCombination
+            'Check-box combinations with 1, 2 or 3 enabled check-boxes.
+            case 1      :   oControlToCheck = ShowValue
+                            sText = "Show value as number"
+            case 2      :   oControlToCheck = AsPercentage
+                            sText = "Show value as percentage"
+            case 3      :   oControlToCheck = ShowLabelText
+                            sText = "Show category"
+            
+            case 4      :   oControlToCheck = ShowValue
+                            oControlToCheck2 = AsPercentage
+                            sText = "Show value as number and Show value as percentage"
+            case 5      :   oControlToCheck = ShowValue
+                            oControlToCheck2 = ShowLabelText
+                            sText = "Show value as number Show category"
+            case 6      :   oControlToCheck2 = AsPercentage
+                            oControlToCheck2 = ShowLabelText
+                            sText = "Show value as percentage and Show category"
+            
+            case 7      :   oControlToCheck = ShowValue
+                            oControlToCheck2 = AsPercentage
+                            oControlToCheck3 = ShowLabelText
+                            sText = "Show value as number and Show value as percentage and Show category"  
+                            
+            case else   :   warnlog "Wrong combination entered. Exiting!"
+                            TabDataPointLabels.Cancel
+                            call hCloseDocument
+                            goto endsub
+        end select
+        'One checked check-box
+        if iCombination > 0 AND iCombination < 4 then
+            if fSetCheckBox(oControlToCheck, TRUE) > 0 then
+                warnlog "Setting check-box '" & sText & "' failed. Exiting test case"
+                TabDataPointLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            else
+                printlog "Check '" & sText & "' and check that text direction-list-box contains 3 entries."
+                sValidateTextDirection(TextDirection)
+            endif
+        endif
+        'Two checked check-boxes
+        if iCombination > 3 AND iCombination < 7 then
+            if fSetCheckBox(oControlToCheck, TRUE) > 0 AND fSetCheckBox(oControlToCheck2, TRUE) > 0 then
+                warnlog "Setting check-box '" & sText & "' failed. Exiting test case"
+                TabDataPointLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            else
+                printlog "Check '" & sText & "' and check that text direction-list-box contains 3 entries."
+                sValidateTextDirection(TextDirection)
+            endif
+            if fSetCheckBox(oControlToCheck2, FALSE) > 0 then
+                warnlog "Unchecking check-box '" & sText & "' failed. Exiting test case"
+                TabDataPointLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            endif            
+        endif
+        'Three checked check-boxes
+        if iCombination = 7 then
+            if fSetCheckBox(oControlToCheck, TRUE) > 0 AND fSetCheckBox(oControlToCheck2, TRUE) > 0 AND fSetCheckBox(oControlToCheck3, TRUE) > 0 then
+                warnlog "Setting check-box '" & sText & "' failed. Exiting test case"
+                TabDataPointLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            else
+                printlog "Check '" & sText & "' and check that text direction-list-box contains 3 entries."
+                sValidateTextDirection(TextDirection)
+            endif
+            if fSetCheckBox(oControlToCheck2, FALSE) > 0 then
+                warnlog "Unchecking check-box '" & sText & "' failed. Exiting test case"
+                TabDataPointLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            endif
+            if fSetCheckBox(oControlToCheck3, FALSE) > 0 then
+                warnlog "Unchecking check-box '" & sText & "' failed. Exiting test case"
+                TabDataPointLabels.Cancel
+                call hCloseDocument
+                goto endsub
+            endif                                
+        end if
+        if fSetCheckBox(oControlToCheck, FALSE) > 0 then
+            warnlog "Unchecking check-box '" & sText & "' failed. Exiting test case"
+            TabDataPointLabels.Cancel
+            call hCloseDocument
+            goto endsub
+        endif
+    next iCombination            
+    TabDataPointLabels.Cancel
+    if bCTLSupBefore <> gCTLSup then
+        Call ActiveDeactivateCTLSupport(bCTLSupBefore)
+        printlog "Reset the state of CTL support to the default before this test case has been executed"
+    endif
+    printlog "File / Close"
+    Call hCloseDocument
+endcase
+'
+'-------------------------------------------------------------------------
+'
+sub sValidateTextDirection (oThisListtBox as OBJECT)
+    Dim iEntries as integer
+    iEntries = 0
+
+    if oThisListtBox.IsEnabled then
+        printlog "Get the count of the list-box entries."
+        iEntries = oThisListtBox.GetItemCount
+        if iEntries <> 3 then
+            warnlog "There are " & iEntries &" and not 3 entries in the text direction list-box!"
+        else
+            printlog "3 entries in the text direction list-box"
+        endif
+    else
+        warnlog "Text direction is not enabled!"
+    endif
+end sub
+
diff --git a/testautomation/global/hid/hid.lst b/testautomation/global/hid/hid.lst
index e861e4c82b32..d709aa7eb213 100755
--- a/testautomation/global/hid/hid.lst
+++ b/testautomation/global/hid/hid.lst
@@ -1,4 +1,4 @@
-DEV300m25_HID_Eigen 01010100101010101010101010
+DEV300m31_HID_Eigen 01010100101010101010101010
 
 TB_SW_TEXT_TOOLBOX 23265
 TB_SW_TABLE_TOOLBOX 23266
@@ -4064,28 +4064,28 @@ HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM 40049
 HID_SVX_NEW_TOOLBAR 40050
 HID_SVX_MODIFY_TOOLBAR 40051
 HID_SVX_NEW_TOOLBAR_ITEM 40052
-HID_COLORPAGE_DBREPORTHEADER_CB 40053
 HID_SVX_CONFIG_MENU_LISTBOX 40053
-HID_COLORPAGE_DBREPORTFOOTER_CB 40054
 HID_SVX_OPTIONS_ONLINEUPDATE 40054
-HID_COLORPAGE_DBPAGEHEADER_CB 40055
 HID_OPTIONS_CHART_DEFCOLORS 40055
-HID_COLORPAGE_DBPAGEFOOTER_CB 40056
 HID_OPTIONS_MULTIPATH_LIST 40056
-HID_COLORPAGE_DBGROUPHEADER_CB 40057
-HID_COLORPAGE_DBGROUPFOOTER_CB 40058
-HID_COLORPAGE_DBCOLUMNHEADER_CB 40059
-HID_COLORPAGE_DBCOLUMNFOOTER_CB 40060
-HID_COLORPAGE_DBDETAIL_CB 40061
-HID_COLORPAGE_DBREPORTHEADER_LB 40062
-HID_COLORPAGE_DBREPORTFOOTER_LB 40063
-HID_COLORPAGE_DBPAGEHEADER_LB 40064
-HID_COLORPAGE_DBPAGEFOOTER_LB 40065
-HID_COLORPAGE_DBGROUPHEADER_LB 40066
-HID_COLORPAGE_DBGROUPFOOTER_LB 40067
-HID_COLORPAGE_DBCOLUMNHEADER_LB 40068
-HID_COLORPAGE_DBCOLUMNFOOTER_LB 40069
-HID_COLORPAGE_DBDETAIL_LB 40070
+HID_COLORPAGE_DBREPORTHEADER_CB 40057
+HID_COLORPAGE_DBREPORTFOOTER_CB 40058
+HID_COLORPAGE_DBPAGEHEADER_CB 40059
+HID_COLORPAGE_DBPAGEFOOTER_CB 40060
+HID_COLORPAGE_DBGROUPHEADER_CB 40061
+HID_COLORPAGE_DBGROUPFOOTER_CB 40062
+HID_COLORPAGE_DBCOLUMNHEADER_CB 40063
+HID_COLORPAGE_DBCOLUMNFOOTER_CB 40064
+HID_COLORPAGE_DBDETAIL_CB 40065
+HID_COLORPAGE_DBREPORTHEADER_LB 40066
+HID_COLORPAGE_DBREPORTFOOTER_LB 40067
+HID_COLORPAGE_DBPAGEHEADER_LB 40068
+HID_COLORPAGE_DBPAGEFOOTER_LB 40069
+HID_COLORPAGE_DBGROUPHEADER_LB 40070
+HID_COLORPAGE_DBGROUPFOOTER_LB 40071
+HID_COLORPAGE_DBCOLUMNHEADER_LB 40072
+HID_COLORPAGE_DBCOLUMNFOOTER_LB 40073
+HID_COLORPAGE_DBDETAIL_LB 40074
 HID_NUMBERFORMAT_WND_NUMBER_PREVIEW 40075
 HID_BACKINGWINDOW 40368
 HID_LICENSEDIALOG 40369
@@ -5955,6 +5955,22 @@ HID_SCH_TRENDLINE_RB_EXPONENTIAL 63378
 HID_SCH_TRENDLINE_RB_POWER 63379
 HID_SCH_TRENDLINE_SHOW_EQUATION 63380
 HID_SCH_TRENDLINE_SHOW_R_SQUARED 63381
+HID_SCH_STATISTIK_FUNCTION 63382
+HID_SCH_STATISTIK_RANGE 63383
+HID_SCH_STATISTIK_FUNCTION_LB 63384
+HID_SCH_STATISTIK_POSITIVE_VALUE 63385
+HID_SCH_STATISTIK_POSITIVE_RANGE 63386
+HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER 63387
+HID_SCH_STATISTIK_NEGATIVE_VALUE 63388
+HID_SCH_STATISTIK_NEGATIVE_RANGE 63389
+HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER 63390
+HID_SCH_STATISTIK_SAME_FOR_BOTH 63391
+HID_SCH_STATISTIK_SHOW_BOTH 63392
+HID_SCH_STATISTIK_SHOW_POSITIVE 63393
+HID_SCH_STATISTIK_SHOW_NEGATIVE 63394
+HID_SCH_TEXTDIRECTION 63395
+HID_SCH_TEXTDIRECTION_TITLE 63396
+HID_SCH_TEXTDIRECTION_EQUATION 63397
 HID_BASICIDE_OBJECTS 63537
 HID_BASICIDE_CONTROLS 63543
 HID_BASICIDE_MACROS 63544
@@ -6288,6 +6304,7 @@ sd:ListBox:TP_ANIMATION:LB_ACTION 549768707
 sd:ListBox:TP_ANIMATION:LB_OLE_ACTION 549768708
 sd:PushButton:TP_ANIMATION:BTN_SEARCH 549769729
 sd:PushButton:TP_ANIMATION:BTN_SEEK 549769730
+chart2:ListBox:TP_LEGEND_POS:LB_LEGEND_TEXTDIR 551620100
 chart2:CheckBox:TP_SCALE_Y:CBX_AUTO_MIN 551666689
 chart2:CheckBox:TP_SCALE_Y:CBX_AUTO_MAX 551666690
 chart2:CheckBox:TP_SCALE_Y:CBX_AUTO_STEP_MAIN 551666691
@@ -6381,6 +6398,7 @@ chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER 551944721
 chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR 551945217
 chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP 551945227
 chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK 551945228
+chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR 551947796
 sd:TabPage:RID_SD_TABPAGE_HEADERFOOTER 553254912
 sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_FIXED 553255427
 sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_AUTOMATIC 553255429
@@ -7085,11 +7103,8 @@ svx:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES 704677265
 svx:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET 704679836
 svx:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET 704679838
 svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC 704726530
-svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_ALLOW_WORD_BREAK 704726531
 svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN 704726532
-svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_PUNCTUATION 704726534
 svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE 704726535
-svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_ADJUST_NUMBERS 704726536
 svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING 704741890
 svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT 704741891
 svx:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP 704741893
@@ -8279,7 +8294,6 @@ sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGENUM 957044770
 sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEWIDTH 957044771
 sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEHEIGHT 957044772
 sc:MetricField:RID_SCPAGE_TABLE:ED_SCALEALL 957045280
-sc:ListBox:RID_HFBASE:LB_DEFINED 957140509
 sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESTD 957252105
 sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESC10 957252106
 sc:RadioButton:RID_SCPAGE_CALC:BTN_DATE1904 957252107
@@ -8634,9 +8648,9 @@ padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_NEXT 1106514435
 padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_PREV 1106514436
 desktop:ModalDialog:RID_DLG_DEPENDENCIES 1106526208
 desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST 1106529794
-desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL 1106658309
-desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS 1106659847
-desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK 1106661898
+desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL 1106674693
+desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS 1106676231
+desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK 1106678282
 desktop:MultiLineEdit:RID_DLG_UPDATEINSTALL:RID_DLG_UPDATE_INSTALL_INFO 1106840076
 sfx2:CheckBox:DLG_NEW_FILE:CB_TEXT_STYLE 1107379233
 sfx2:CheckBox:DLG_NEW_FILE:CB_FRAME_STYLE 1107379234
@@ -9100,6 +9114,7 @@ svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD 1368919568
 svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND 1368919573
 svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE 1368919575
 svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF 1368920595
+svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT 1368933377
 svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME 1368934412
 svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST 1368949776
 svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME 1368950796
@@ -10234,4 +10249,3 @@ HID_GLOBAL_FALLBACK 4294967295
 HID_PASTE_DLG 34868
 HID_LINKDLG_TABLB 34869
 
-
diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win
index 275b4dd8e8c3..4780ee29173c 100755
--- a/testautomation/global/win/etab_a_d.win
+++ b/testautomation/global/win/etab_a_d.win
@@ -131,12 +131,9 @@ NoStartOfLine svx:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START
 NoEndOfLine svx:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END
 
 *TabAsianTypography HID_SVXPAGE_PARA_ASIAN
+ApplyList svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN
 AllowHangingPunctuation svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC
 ApplySpacingBetween svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE
-ApplyList svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN
-AllowBreak svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_ALLOW_WORD_BREAK
-AllowPunctuation svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_PUNCTUATION
-AutomaticallyAdjust2 svx:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_ADJUST_NUMBERS
 
 *TabAutoCaption HID_OPTCAPTION_PAGE
 ObjectList HID_OPTCAPTION_CLB
@@ -168,7 +165,8 @@ Remove HID_NUM_RESET
  Break             chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK
  AngleKnob         HID_SCH_ALIGNMENT_CTR_DIAL
  AngleText         HID_SCH_ALIGNMENT_DEGREES
- VerticallyStacked HID_SCH_ALIGNMENT_STACKED
+ VerticallyStacked HID_SCH_ALIGNMENT_STACKED 
+ TextDirection     chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR 
  
 *TabChartAxisNumbers HID_NUMBERFORMAT
  Category            svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
@@ -421,6 +419,7 @@ NumberFormat            HID_SCH_PB_NUMBERFORMAT
 PercentageFormat        HID_SCH_PB_PERCENT_NUMBERFORMAT
 Separator               HID_SCH_DATALABEL_SEPARATOR
 Placement               HID_SCH_DATALABEL_PLACEMENT
+TextDirection           HID_SCH_TEXTDIRECTION
 
 +TabDataPointLabels TabDataSeriesLabels
 
diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win
index fcb712e160fe..0dc1d3a908a7 100755
--- a/testautomation/global/win/etab_e_g.win
+++ b/testautomation/global/win/etab_e_g.win
@@ -188,7 +188,9 @@ Super svx:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS
  AngleKnob                    HID_SCH_ALIGNMENT_CTR_DIAL
  AngleText                    HID_SCH_ALIGNMENT_DEGREES
  VerticallyStacked            HID_SCH_ALIGNMENT_STACKED
- 
+ TextDirection                HID_SCH_TEXTDIRECTION_TITLE
+ TextDirection2               HID_SCH_TEXTDIRECTION_EQUATION
+
 *TabFormatChartLine HID_LINE_LINE
  Style               svx:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE
  Color               svx:ListBox:RID_SVXPAGE_LINE:LB_COLOR
diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win
index 615adc0099a7..bc619d032f28 100755
--- a/testautomation/global/win/etab_h_o.win
+++ b/testautomation/global/win/etab_h_o.win
@@ -52,10 +52,11 @@ PortNumber HID_DSADMIN_LDAP_PORTNUMBER
 Records HID_DSADMIN_LDAP_ROWCOUNT
 
 *TabLegendPosition HID_SCH_LEGEND_POS
- PostionLeft       HID_SCH_LEGEND_POS_LEFT
- PostionTop        HID_SCH_LEGEND_POS_TOP
- PostionRight      HID_SCH_LEGEND_POS_RIGHT
- PostionBottom     HID_SCH_LEGEND_POS_BOTTOM
+ PostionLeft        HID_SCH_LEGEND_POS_LEFT
+ PostionTop         HID_SCH_LEGEND_POS_TOP
+ PostionRight       HID_SCH_LEGEND_POS_RIGHT
+ PostionBottom      HID_SCH_LEGEND_POS_BOTTOM
+ TextDirection      chart2:ListBox:TP_LEGEND_POS:LB_LEGEND_TEXTDIR 
 
 *TabListBoxData extensions:TabPage:RID_PAGE_TABLESELECTION
 DataSource extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE