calc66: merge

3 files changed, 30 insertions, 25 deletions

diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 54d1c102d5be..d782f0ee8dcd 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -313,6 +313,11 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aRefBtn.Hide();
 
     pMEdit = aMEFormula.GetEdit();
+    //IAccessibility2 Implementation 2009-----
+    aMEFormula.SetAccessibleName(aFtFormula.GetText());
+    if (pMEdit)
+        pMEdit->SetAccessibleName(aFtFormula.GetText());
+    //-----IAccessibility2 Implementation 2009
     m_aEditHelpId = pMEdit->GetHelpId();
     pMEdit->SetUniqueId( m_aEditHelpId );
 
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index e51f9dc8a9c8..3a21a99b0da7 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -56,24 +56,24 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
     aFtArgName      ( this, ModuleRes( FT_PARNAME ) ),
     aFtArgDesc      ( this, ModuleRes( FT_PARDESC ) ),
 
+    aBtnFx1         ( this, ModuleRes( BTN_FX1 ) ),
     aFtArg1         ( this, ModuleRes( FT_ARG1 ) ),
-    aFtArg2         ( this, ModuleRes( FT_ARG2 ) ),
-    aFtArg3         ( this, ModuleRes( FT_ARG3 ) ),
-    aFtArg4         ( this, ModuleRes( FT_ARG4 ) ),
+    aEdArg1         ( this, ModuleRes( ED_ARG1 ) ),
+    aRefBtn1        ( this, ModuleRes( RB_ARG1 ) ),
 
-    aBtnFx1         ( this, ModuleRes( BTN_FX1 ) ),
     aBtnFx2         ( this, ModuleRes( BTN_FX2 ) ),
-    aBtnFx3         ( this, ModuleRes( BTN_FX3 ) ),
-    aBtnFx4         ( this, ModuleRes( BTN_FX4 ) ),
-
-    aEdArg1         ( this, ModuleRes( ED_ARG1 ) ),
+    aFtArg2         ( this, ModuleRes( FT_ARG2 ) ),
     aEdArg2         ( this, ModuleRes( ED_ARG2 ) ),
-    aEdArg3         ( this, ModuleRes( ED_ARG3 ) ),
-    aEdArg4         ( this, ModuleRes( ED_ARG4 ) ),
-
-    aRefBtn1        ( this, ModuleRes( RB_ARG1 ) ),
     aRefBtn2        ( this, ModuleRes( RB_ARG2 ) ),
+
+    aBtnFx3         ( this, ModuleRes( BTN_FX3 ) ),
+    aFtArg3         ( this, ModuleRes( FT_ARG3 ) ),
+    aEdArg3         ( this, ModuleRes( ED_ARG3 ) ),
     aRefBtn3        ( this, ModuleRes( RB_ARG3 ) ),
+
+    aBtnFx4         ( this, ModuleRes( BTN_FX4 ) ),
+    aFtArg4         ( this, ModuleRes( FT_ARG4 ) ),
+    aEdArg4         ( this, ModuleRes( ED_ARG4 ) ),
     aRefBtn4        ( this, ModuleRes( RB_ARG4 ) ),
 
     aSlider         ( this, ModuleRes( WND_SLIDER ) ),
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 990eafd28ba2..55c2bd7204b8 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -68,25 +68,25 @@ private:
         FixedText       aFtArgName;
         FixedInfo       aFtArgDesc;
 
+        ImageButton     aBtnFx1;
         FixedText       aFtArg1;
-        FixedText       aFtArg2;
-        FixedText       aFtArg3;
-        FixedText       aFtArg4;
+        ArgEdit         aEdArg1;
+        RefButton       aRefBtn1;
 
-        ImageButton     aBtnFx1;
         ImageButton     aBtnFx2;
-        ImageButton     aBtnFx3;
-        ImageButton     aBtnFx4;
-
-        ArgEdit         aEdArg1;
+        FixedText       aFtArg2;
         ArgEdit         aEdArg2;
+        RefButton       aRefBtn2;
+
+        ImageButton     aBtnFx3;
+        FixedText       aFtArg3;
         ArgEdit         aEdArg3;
-        ArgEdit         aEdArg4;
+        RefButton       aRefBtn3;
 
-        RefButton   aRefBtn1;
-        RefButton   aRefBtn2;
-        RefButton   aRefBtn3;
-        RefButton   aRefBtn4;
+        ImageButton     aBtnFx4;
+        FixedText       aFtArg4;
+        ArgEdit         aEdArg4;
+        RefButton       aRefBtn4;
 
         ScrollBar       aSlider;
         String          m_sOptional;