CWS-TOOLING: integrate CWS accfixes

17 files changed, 75 insertions, 9 deletions

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 5e8bd7336b86..4f52f7f23220 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -1173,6 +1173,8 @@ void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, c
 
     m_pFT_NumberOfLines->Show();
     m_pMF_NumberOfLines->Show();
+    m_pMF_NumberOfLines->SetAccessibleName(m_pFT_NumberOfLines->GetText());
+    m_pMF_NumberOfLines->SetAccessibleRelationLabeledBy(m_pFT_NumberOfLines);
 }
 void CombiColumnLineChartDialogController::hideExtraControls() const
 {
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index 1c0a066df046..bb2538a97cad 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -101,6 +101,15 @@ String STR_PAGE_POSITION
     Text [ en-US ] = "Position" ;
 };
 
+String STR_BUTTON_UP
+{
+    Text [ en-US ] = "Up";
+};
+String STR_BUTTON_DOWN
+{
+    Text [ en-US ] = "Down";
+};
+
 String STR_PAGE_LAYOUT
 {
     Text [ en-US ] = "Layout";
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index ee2278589b89..59beaf35a152 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -48,6 +48,8 @@ BarGeometryResources::BarGeometryResources( Window* pWindow )
 {
     m_aFT_Geometry.SetText( String( SchResId( STR_BAR_GEOMETRY )) );
     m_aFT_Geometry.SetSizePixel( m_aFT_Geometry.CalcMinimumSize() );
+    m_aLB_Geometry.SetAccessibleName(m_aFT_Geometry.GetText());
+    m_aLB_Geometry.SetAccessibleRelationLabeledBy(&m_aFT_Geometry);
 }
 void BarGeometryResources::SetPosPixel( const Point& rPosition )
 {
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 3a7294cd3ed2..4093cf34894f 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -60,8 +60,8 @@ LegendPositionResources::LegendPositionResources( Window* pWindow )
     : m_xCC() //unused in this scenario
     , m_aCbxShow( pWindow ) //unused in this scenario
     , m_aRbtLeft( pWindow, SchResId(RBT_LEFT) )
-    , m_aRbtTop( pWindow, SchResId(RBT_TOP) )
     , m_aRbtRight( pWindow, SchResId(RBT_RIGHT) )
+    , m_aRbtTop( pWindow, SchResId(RBT_TOP) )
     , m_aRbtBottom( pWindow, SchResId(RBT_BOTTOM) )
 {
     m_aCbxShow.Check();//legend is assumed to be visible in this scenario
@@ -72,12 +72,17 @@ LegendPositionResources::LegendPositionResources( Window* pWindow, const uno::Re
     : m_xCC( xCC )
     , m_aCbxShow( pWindow, SchResId(CBX_SHOWLEGEND) )
     , m_aRbtLeft( pWindow, SchResId(RBT_LEFT) )
-    , m_aRbtTop( pWindow, SchResId(RBT_TOP) )
     , m_aRbtRight( pWindow, SchResId(RBT_RIGHT) )
+    , m_aRbtTop( pWindow, SchResId(RBT_TOP) )
     , m_aRbtBottom( pWindow, SchResId(RBT_BOTTOM) )
 {
     m_aCbxShow.SetToggleHdl( LINK( this, LegendPositionResources, PositionEnableHdl ) );
     impl_setRadioButtonToggleHdl();
+    m_aCbxShow.SetAccessibleRelationMemberOf(&m_aCbxShow);
+    m_aRbtLeft.SetAccessibleRelationMemberOf(&m_aCbxShow);
+    m_aRbtRight.SetAccessibleRelationMemberOf(&m_aCbxShow);
+    m_aRbtTop.SetAccessibleRelationMemberOf(&m_aCbxShow);
+    m_aRbtBottom.SetAccessibleRelationMemberOf(&m_aCbxShow);
 }
 
 void LegendPositionResources::impl_setRadioButtonToggleHdl()
@@ -257,6 +262,14 @@ void LegendPositionResources::SetChangeHdl( const Link& rLink )
     m_aChangeLink = rLink;
 }
 
+void LegendPositionResources::SetAccessibleRelationMemberOf(Window* pMemberOf)
+{
+    m_aRbtLeft.SetAccessibleRelationMemberOf(pMemberOf);
+    m_aRbtRight.SetAccessibleRelationMemberOf(pMemberOf);
+    m_aRbtTop.SetAccessibleRelationMemberOf(pMemberOf);
+    m_aRbtBottom.SetAccessibleRelationMemberOf(pMemberOf);
+}
+
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx
index ee0ac5a7601c..a4809df97239 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx
@@ -44,6 +44,7 @@ namespace chart
 
 class LegendPositionResources
 {
+
 public:
     //constructor without Display checkbox
     LegendPositionResources( Window* pParent );
@@ -66,6 +67,8 @@ public:
     DECL_LINK( PositionEnableHdl, void* );
     DECL_LINK( PositionChangeHdl, RadioButton* );
 
+    void SetAccessibleRelationMemberOf(Window* pMemberOf); //IAccessibility2 Implementation 2009-----
+
 private:
     void impl_setRadioButtonToggleHdl();
 
@@ -76,8 +79,8 @@ private:
     CheckBox        m_aCbxShow;
 
     RadioButton     m_aRbtLeft;
-    RadioButton     m_aRbtTop;
     RadioButton     m_aRbtRight;
+    RadioButton     m_aRbtTop;
     RadioButton     m_aRbtBottom;
 
     Link            m_aChangeLink;
diff --git a/chart2/source/controller/dialogs/res_TextSeparator.cxx b/chart2/source/controller/dialogs/res_TextSeparator.cxx
index 8878f5f77ffc..9cca483b711d 100644
--- a/chart2/source/controller/dialogs/res_TextSeparator.cxx
+++ b/chart2/source/controller/dialogs/res_TextSeparator.cxx
@@ -59,6 +59,9 @@ TextSeparatorResources::TextSeparatorResources( Window* pWindow )
     m_aEntryMap[ C2U( ", " ) ] = 1;
     m_aEntryMap[ C2U( "; " ) ] = 2;
     m_aEntryMap[ C2U( "\n" ) ] = 3;
+
+    m_aLB_Separator.SetAccessibleName(m_aFT_Separator.GetText());
+    m_aLB_Separator.SetAccessibleRelationLabeledBy(&m_aFT_Separator);
 }
 TextSeparatorResources::~TextSeparatorResources()
 {
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 8e32a4f6a262..be6500b54e93 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -110,9 +110,9 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(
                 , m_aFT_Scheme      ( this, SchResId( FT_SCHEME ) )
                 , m_aLB_Scheme      ( this, SchResId( LB_SCHEME ) )
                 , m_aFL_Seperator   ( this, SchResId( FL_SEPERATOR ) )
-                , m_aCB_RoundedEdge ( this, SchResId( CB_ROUNDEDEDGE ) )
                 , m_aCB_Shading     ( this, SchResId( CB_SHADING ) )
                 , m_aCB_ObjectLines ( this, SchResId( CB_OBJECTLINES ) )
+                , m_aCB_RoundedEdge ( this, SchResId( CB_ROUNDEDEDGE ) )
                 , m_bUpdateOtherControls( true )
                 , m_bCommitToModel( true )
                 , m_rControllerLockHelper( rControllerLockHelper )
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index 252c5c21669b..0e119d959c66 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -82,9 +82,9 @@ private:
 
     FixedLine       m_aFL_Seperator;
 
-    CheckBox        m_aCB_RoundedEdge;
     CheckBox        m_aCB_Shading;
     CheckBox        m_aCB_ObjectLines;
+    CheckBox        m_aCB_RoundedEdge;
 
     bool            m_bUpdateOtherControls;
     bool            m_bCommitToModel;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index ff1e784b5ff9..0d3914460e78 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -162,6 +162,8 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow
     {
         m_aCbxRightAngledAxes.Enable(false);
     }
+    m_aMFPerspective.SetAccessibleName(m_aCbxPerspective.GetText());
+    m_aMFPerspective.SetAccessibleRelationLabeledBy(&m_aCbxPerspective);
 }
 
 ThreeD_SceneGeometry_TabPage::~ThreeD_SceneGeometry_TabPage()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 2310e193e5ba..1c75fcab7a0f 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -357,6 +357,15 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin
     //m_aDelyedModelChangeTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT );
 
     m_aModelChangeListener.startListening( uno::Reference< util::XModifyBroadcaster >(m_xSceneProperties, uno::UNO_QUERY) );
+    m_aBtn_Light1.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
+    m_aBtn_Light2.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
+    m_aBtn_Light3.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
+    m_aBtn_Light4.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
+    m_aBtn_Light5.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
+    m_aBtn_Light6.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
+    m_aBtn_Light7.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
+    m_aBtn_Light8.SetAccessibleRelationLabeledBy(&m_aFT_LightSource);
+    m_aCtl_Preview.SetAccessibleName(String(SchResId( STR_LIGHT_PREVIEW )));
 }
 
 ThreeD_SceneIllumination_TabPage::~ThreeD_SceneIllumination_TabPage()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc
index e2d031955867..f5ae0dcda267 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc
@@ -42,5 +42,7 @@
 #define BTN_LIGHT_6           8
 #define BTN_LIGHT_7           9
 #define BTN_LIGHT_8           10
-
+//IAccessibility2 Implementation 2009-----
+#define STR_LIGHT_PREVIEW     6000
+//-----IAccessibility2 Implementation 2009
 #define CTL_LIGHT_PREVIEW     1
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src
index 0b052f4d00c6..cf5898af8c85 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src
@@ -173,3 +173,8 @@ TabPage TP_3D_SCENEILLUMINATION
     };
 };
 
+String STR_LIGHT_PREVIEW
+{
+    Text [ en-US ] = "Light Preview" ;
+};
+
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 3538277c2004..508bec302bf2 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -222,6 +222,10 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn
     m_aLB_PlaceLabels.SetSelectHdl( LINK( this, AxisPositionsTabPage, PlaceLabelsSelectHdl ) );
     m_aLB_PlaceLabels.SetDropDownLineCount( m_aLB_PlaceLabels.GetEntryCount() );
     m_aLB_PlaceTicks.SetDropDownLineCount( m_aLB_PlaceTicks.GetEntryCount() );
+    m_aCB_TicksInner.SetAccessibleRelationLabeledBy(&m_aFT_Major);
+    m_aCB_TicksOuter.SetAccessibleRelationLabeledBy(&m_aFT_Major);
+    m_aCB_MinorInner.SetAccessibleRelationLabeledBy(&m_aFT_Minor);
+    m_aCB_MinorOuter.SetAccessibleRelationLabeledBy(&m_aFT_Minor);
 }
 
 SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 0504ecee4161..7919820b2100 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -189,6 +189,8 @@ Dim3DLookResourceGroup::Dim3DLookResourceGroup( Window* pWindow )
     m_aLB_Scheme.SetDropDownLineCount(2);
 
     m_aLB_Scheme.SetSelectHdl( LINK( this, Dim3DLookResourceGroup, SelectSchemeHdl ) );
+    m_aLB_Scheme.SetAccessibleName(m_aCB_3DLook.GetText());
+    m_aLB_Scheme.SetAccessibleRelationLabeledBy(&m_aCB_3DLook);
 }
 Dim3DLookResourceGroup::~Dim3DLookResourceGroup()
 {
@@ -344,6 +346,9 @@ StackingResourceGroup::StackingResourceGroup( Window* pWindow )
     m_aRB_Stack_Y.SetToggleHdl( LINK( this, StackingResourceGroup, StackingChangeHdl ) );
     m_aRB_Stack_Y_Percent.SetToggleHdl( LINK( this, StackingResourceGroup, StackingChangeHdl ) );
     m_aRB_Stack_Z.SetToggleHdl( LINK( this, StackingResourceGroup, StackingChangeHdl ) );
+    m_aRB_Stack_Y.SetAccessibleRelationMemberOf(&m_aCB_Stacked);
+    m_aRB_Stack_Y_Percent.SetAccessibleRelationMemberOf(&m_aCB_Stacked);
+    m_aRB_Stack_Z.SetAccessibleRelationMemberOf(&m_aCB_Stacked);
 }
 StackingResourceGroup::~StackingResourceGroup()
 {
@@ -472,9 +477,9 @@ private:
     MetricField m_aMF_SplineOrder;
 
     FixedLine       m_aFL_DialogButtons;
+    HelpButton      m_aBP_Help;
     OKButton        m_aBP_OK;
     CancelButton    m_aBP_Cancel;
-    HelpButton      m_aBP_Help;
 };
 
 SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent )
@@ -487,9 +492,9 @@ SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent )
         , m_aFT_SplineOrder( this, SchResId( FT_SPLINE_ORDER ) )
         , m_aMF_SplineOrder( this, SchResId( MF_SPLINE_ORDER ) )
         , m_aFL_DialogButtons( this, SchResId( FL_SPLINE_DIALOGBUTTONS ) )
+    , m_aBP_Help( this, SchResId(BTN_HELP) )
         , m_aBP_OK( this, SchResId(BTN_OK) )
-        , m_aBP_Cancel( this, SchResId(BTN_CANCEL) )
-        , m_aBP_Help( this, SchResId(BTN_HELP) )
+    , m_aBP_Cancel( this, SchResId(BTN_CANCEL) )
 {
     FreeResource();
 
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index ed48747e5502..2eaf97767fa5 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -359,6 +359,8 @@ DataSourceTabPage::DataSourceTabPage(
     if( m_apLB_SERIES->First())
         m_apLB_SERIES->Select( m_apLB_SERIES->First());
     m_apLB_SERIES->GrabFocus();
+    m_aBTN_UP.SetAccessibleName(String(SchResId(STR_BUTTON_UP)));
+    m_aBTN_DOWN.SetAccessibleName(String(SchResId(STR_BUTTON_DOWN)));
 }
 
 DataSourceTabPage::~DataSourceTabPage()
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index e08bd83f869d..049b78d9b6f5 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -51,6 +51,7 @@ SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow,
     , m_aFtTextDirection( this, SchResId( FT_LEGEND_TEXTDIR ) )
     , m_aLbTextDirection( this, SchResId( LB_LEGEND_TEXTDIR ), &m_aFlTextOrient, &m_aFtTextDirection )
 {
+    m_apLegendPositionResources->SetAccessibleRelationMemberOf(&aGrpLegend);
     FreeResource();
 }
 
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index e1b29a8796e4..c5b03392cd8d 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -342,6 +342,10 @@
 #define STR_TEXT_DIRECTION_RTL              (RID_APP_START + 279)
 #define STR_TEXT_DIRECTION_SUPER            (RID_APP_START + 280)
 
+//IAccessibility2 Implementation 2009-----
+#define STR_BUTTON_UP                       (RID_APP_START + 500)
+#define STR_BUTTON_DOWN                     (RID_APP_START + 501)
+//-----IAccessibility2 Implementation 2009
 //-----------------------------------------------------------------------------
 /*
 ////#define STR_DIAGRAM_X_AXIS                  (RID_APP_START + 34)