summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcos Paulo de Souza <marcos.souza.org@gmail.com>2014-03-04 12:04:20 -0300
committerMarcos Paulo de Souza <marcos.souza.org@gmail.com>2014-03-04 12:07:10 -0300
commitc3126202c429f512231272fb934e8334777c5231 (patch)
tree37c16bdc51f7888dbe16587d0bae134e98e7425c
parent5cab4411c98b128fcc26f25194151af0658ddcac (diff)
Fix fdo#65585: Elements Dock: Operators have bad order
Change-Id: Idf29f37032a851632760758d443d73f04bbbae69
-rw-r--r--starmath/source/ElementsDockingWindow.cxx43
1 files changed, 26 insertions, 17 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 79e1e5caa470..aaaba71a5fbf 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] =