accfixes2: module formula, update some accessible names

on focus change and slider move

4 files changed, 25 insertions, 2 deletions

diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 63c0a7eebebf..dd34176e38e8 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -188,6 +188,7 @@ public:
     void Hide();
     void Show();
 
+    void UpdateAccessibleNames();
 };
 
 }
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 4125d8e1ba9c..1fbcae6363a7 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -363,11 +363,12 @@ ModelessDialog RID_FORMULADLG_FORMULA
         Right = TRUE ;
         Text [ en-US ] = "Function result" ;
     };
-    Window WND_RESULT
+    FixedText WND_RESULT
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 255 , 4 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
+        Text [ en-US ] = "Function result" ;
     };
     FixedText FT_FORMULA_RESULT
     {
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index e34c33de2d6d..5a861bffe388 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -34,13 +34,14 @@
 #include <vcl/svapp.hxx>
 #include <vcl/scrbar.hxx>
 
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+
 #include "formula/funcutl.hxx"
 #include "formula/IControlReferenceHandler.hxx"
 #include "ControlHelper.hxx"
 #include "ModuleHelper.hxx"
 #include "ForResId.hrc"
 
-
 namespace formula
 {
 //============================================================================
@@ -74,6 +75,7 @@ ValWnd::ValWnd( Window* pParent, const ResId& rId ) : Window( pParent, rId )
     aRectOut = Rectangle( Point( 1, ( nDiff<2 ) ? 1 : nDiff/2),
                           Size ( aSzWnd.Width()-2, nHeight ) );
     SetClipRegion( Region( aRectOut ) );
+    SetAccessibleRole( ::com::sun::star::accessibility::AccessibleRole::LABEL );
 }
 
 //----------------------------------------------------------------------------
@@ -586,6 +588,21 @@ void ArgInput::EdModify()
     aEdModifyLink.Call(this);
 }
 
+void ArgInput::UpdateAccessibleNames()
+{
+       String aArgName = String::CreateFromAscii(":");
+       aArgName += pFtArg->GetText();
+
+       String aName = pBtnFx->GetQuickHelpText();
+       aName += aArgName;
+       pBtnFx->SetAccessibleName(aName);
+
+       aName = pRefBtn->GetQuickHelpText();
+       aName += aArgName;
+       pRefBtn->SetAccessibleName(aName);
+}
+
+
 /*************************************************************************
 #*  Handle:     FxBtnHdl                                    Date:13.01.97
 #*------------------------------------------------------------------------
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 336832c70332..ecfd4fb22f37 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -330,6 +330,7 @@ void ParaWin::SetEditDesc(const String& aText)
 void ParaWin::SetArgName(sal_uInt16 no,const String& aText)
 {
     aArgInput[no].SetArgName(aText);
+    aArgInput[no].UpdateAccessibleNames();
 }
 
 void ParaWin::SetArgNameFont(sal_uInt16 no,const Font& aFont)
@@ -375,6 +376,7 @@ void ParaWin::InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, ImageButton& rBt
     aArgInput[nPos].SetFxFocusHdl   ( LINK( this, ParaWin, GetFxFocusHdl ) );
     aArgInput[nPos].SetEdFocusHdl   ( LINK( this, ParaWin, GetEdFocusHdl ) );
     aArgInput[nPos].SetEdModifyHdl  ( LINK( this, ParaWin, ModifyHdl ) );
+    aArgInput[nPos].UpdateAccessibleNames();
 }
 
 void ParaWin::ClearAll()
@@ -471,6 +473,7 @@ void ParaWin::SliderMoved()
         aArgInput[nEdFocus].SetArgSelection(Selection(0,SELECTION_MAX ));
         nActiveLine=nEdFocus+nOffset;
         ArgumentModified();
+        aArgInput[nEdFocus].UpdateAccessibleNames();
     }
     aScrollLink.Call(this);
 }
@@ -551,6 +554,7 @@ IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput*, pPtr )
         UpdateArgDesc( nEdFocus );
         nActiveLine=nEdFocus+nOffset;
         ArgumentModified();
+        aArgInput[nEdFocus].UpdateAccessibleNames();
     }
 
     return 0;