[Libreoffice-commits] core.git: starmath/source

[Marcos Paulo de Souza]

 starmath/source/ElementsDockingWindow.cxx |   43 ++++++++++++++++++------------
 1 file changed, 26 insertions(+), 17 deletions(-)

New commits:
commit c3126202c429f512231272fb934e8334777c5231
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date:   Tue Mar 4 12:04:20 2014 -0300

    Fix fdo#65585: Elements Dock: Operators have bad order
    
    Change-Id: Idf29f37032a851632760758d443d73f04bbbae69

diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 79e1e5c..aaaba71 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -116,26 +116,35 @@ const sal_uInt16 SmElementsControl::aFunctions[][2] =
 
 const sal_uInt16 SmElementsControl::aOperators[][2] =
 {
-    {RID_LIMX, RID_LIMX_HELP}, {RID_SUMX, RID_SUMX_HELP}, {RID_PRODX, RID_PRODX_HELP},
-    {RID_COPRODX, RID_COPRODX_HELP}, {RID_INTX, RID_INTX_HELP}, {RID_IINTX, RID_IINTX_HELP},
-    {RID_IIINTX, RID_IIINTX_HELP}, {RID_LINTX, RID_LINTX_HELP}, {RID_LLINTX, RID_LLINTX_HELP},
-    {RID_LLLINTX, RID_LLLINTX_HELP},
+    {RID_LIMX, RID_LIMX_HELP}, {RID_LIM_FROMX, RID_LIM_FROMX_HELP},
+    {RID_LIM_TOX, RID_LIM_TOX_HELP}, {RID_LIM_FROMTOX, RID_LIM_FROMTOX_HELP},
     {0xFFFF, 0},
-    {RID_LIM_FROMX, RID_LIM_FROMX_HELP}, {RID_SUM_FROMX, RID_SUM_FROMX_HELP}, {RID_PROD_FROMX, RID_PROD_FROMX_HELP},
-    {RID_COPROD_FROMX, RID_COPROD_FROMX_HELP}, {RID_INT_FROMX, RID_INT_FROMX_HELP},
-    {RID_IINT_FROMX, RID_IINT_FROMX_HELP}, {RID_IIINT_FROMX, RID_IIINT_FROMX_HELP},
-    {RID_LINT_FROMX, RID_LINT_FROMX_HELP}, {RID_LLINT_FROMX, RID_LLINT_FROMX_HELP}, {RID_LLLINT_FROMX, RID_LLLINT_FROMX_HELP},
+    {RID_SUMX, RID_SUMX_HELP}, {RID_SUM_FROMX, RID_SUM_FROMX_HELP},
+    {RID_SUM_TOX, RID_SUM_TOX_HELP}, {RID_SUM_FROMTOX, RID_SUM_FROMTOX_HELP},
     {0xFFFF, 0},
-    {RID_LIM_TOX, RID_LIM_TOX_HELP}, {RID_SUM_TOX, RID_SUM_TOX_HELP}, {RID_PROD_TOX, RID_PROD_TOX_HELP},
-    {RID_COPROD_TOX, RID_COPROD_TOX_HELP}, {RID_INT_TOX, RID_INT_TOX_HELP}, {RID_IINT_TOX, RID_IINT_TOX_HELP},
-    {RID_IIINT_TOX, RID_IIINT_TOX_HELP}, {RID_LINT_TOX, RID_LINT_TOX_HELP}, {RID_LLINT_TOX, RID_LLINT_TOX_HELP},
-    {RID_LLLINT_TOX, RID_LLLINT_TOX_HELP},
+    {RID_PRODX, RID_PRODX_HELP}, {RID_PROD_FROMX, RID_PROD_FROMX_HELP},
+    {RID_PROD_TOX, RID_PROD_TOX_HELP}, {RID_PROD_FROMTOX, RID_PROD_FROMTOX_HELP},
     {0xFFFF, 0},
-    {RID_LIM_FROMTOX, RID_LIM_FROMTOX_HELP}, {RID_SUM_FROMTOX, RID_SUM_FROMTOX_HELP},
-    {RID_PROD_FROMTOX, RID_PROD_FROMTOX_HELP}, {RID_COPROD_FROMTOX, RID_COPROD_FROMTOX_HELP},
-    {RID_INT_FROMTOX, RID_INT_FROMTOX_HELP}, {RID_IINT_FROMTOX, RID_IINT_FROMTOX_HELP},
-    {RID_IIINT_FROMTOX, RID_IIINT_FROMTOX_HELP}, {RID_LINT_FROMTOX, RID_LINT_FROMTOX_HELP},
-    {RID_LLINT_FROMTOX, RID_LLINT_FROMTOX_HELP}, {RID_LLLINT_FROMTOX, RID_LLLINT_FROMTOX_HELP}
+    {RID_COPRODX, RID_COPRODX_HELP}, {RID_COPROD_FROMX, RID_COPROD_FROMX_HELP},
+    {RID_COPROD_TOX, RID_COPROD_TOX_HELP}, {RID_COPROD_FROMTOX, RID_COPROD_FROMTOX_HELP},
+    {0xFFFF, 0},
+    {RID_INTX, RID_INTX_HELP}, {RID_INT_FROMX, RID_INT_FROMX_HELP},
+    {RID_INT_TOX, RID_INT_TOX_HELP}, {RID_INT_FROMTOX, RID_INT_FROMTOX_HELP},
+    {0xFFFF, 0},
+    {RID_IINTX, RID_IINTX_HELP}, {RID_IINT_FROMX, RID_IINT_FROMX_HELP},
+    {RID_IINT_TOX, RID_IINT_TOX_HELP}, {RID_IINT_FROMTOX, RID_IINT_FROMTOX_HELP},
+    {0xFFFF, 0},
+    {RID_IIINTX, RID_IIINTX_HELP}, {RID_IIINT_FROMX, RID_IIINT_FROMX_HELP},
+    {RID_IIINT_TOX, RID_IIINT_TOX_HELP}, {RID_IIINT_FROMTOX, RID_IIINT_FROMTOX_HELP},
+    {0xFFFF, 0},
+    {RID_LINTX, RID_LINTX_HELP}, {RID_LINT_FROMX, RID_LINT_FROMX_HELP},
+    {RID_LINT_TOX, RID_LINT_TOX_HELP}, {RID_LINT_FROMTOX, RID_LINT_FROMTOX_HELP},
+    {0xFFFF, 0},
+    {RID_LLINTX, RID_LINTX_HELP}, {RID_LLINT_FROMX, RID_LLINT_FROMX_HELP},
+    {RID_LLINT_TOX, RID_LINT_TOX_HELP}, {RID_LLINT_FROMTOX, RID_LLINT_FROMTOX_HELP},
+    {0xFFFF, 0},
+    {RID_LLLINTX, RID_LINTX_HELP}, {RID_LLLINT_FROMX, RID_LLLINT_FROMX_HELP},
+    {RID_LLLINT_TOX, RID_LINT_TOX_HELP}, {RID_LLLINT_FROMTOX, RID_LLLINT_FROMTOX_HELP},
 };
 
 const sal_uInt16 SmElementsControl::aAttributes[][2] =