diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-11-13 17:10:43 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-11-14 09:43:02 +0100 |
commit | 2e00906285c59bf49efaa07df83293d8cd21c9bb (patch) | |
tree | 17d977149f6c4b4ef644dfd19340ccc5968d714a /starmath/source | |
parent | bd8b4f2b5dea5b3a0db7eac4e8d44918f1d8ec79 (diff) |
fdo#71580: Elements dock: Alignment items are missing
Also add << and >> to the Elements dock.
Change-Id: Id58d64c8ab938259e84ce1a178644c6d4a6ee95d
Diffstat (limited to 'starmath/source')
-rw-r--r-- | starmath/source/ElementsDockingWindow.cxx | 12 | ||||
-rw-r--r-- | starmath/source/commands.src | 11 | ||||
-rw-r--r-- | starmath/source/smres.src | 12 |
3 files changed, 29 insertions, 6 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index cda53efe3421..5ce08e27dc53 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -70,6 +70,7 @@ const sal_uInt16 SmElementsControl::aRelationsList[][2] = {RID_XEQY, RID_XEQY_HELP}, {RID_XNEQY, RID_XNEQY_HELP}, {RID_XLTY, RID_XLTY_HELP}, {RID_XLEY, RID_XLEY_HELP}, {RID_XLESLANTY, RID_XLESLANTY_HELP}, {RID_XGTY, RID_XGTY_HELP}, {RID_XGEY, RID_XGEY_HELP}, {RID_XGESLANTY, RID_XGESLANTY_HELP}, + {RID_XLLY, RID_XLLY_HELP}, {RID_XGGY, RID_XGGY_HELP}, {0xFFFF, 0}, {RID_XAPPROXY, RID_XAPPROXY_HELP}, {RID_XSIMY, RID_XSIMY_HELP}, {RID_XSIMEQY, RID_XSIMEQY_HELP}, {RID_XEQUIVY, RID_XEQUIVY_HELP}, {RID_XPROPY, RID_XPROPY_HELP}, {RID_XPARALLELY, RID_XPARALLELY_HELP}, @@ -182,7 +183,10 @@ const sal_uInt16 SmElementsControl::aFormats[][2] = {RID_LSUBX, RID_LSUBX_HELP}, {RID_CSUPX, RID_CSUPX_HELP}, {RID_CSUBX, RID_CSUBX_HELP}, {0xFFFF, 0}, {RID_NEWLINE, RID_NEWLINE_HELP}, {RID_SBLANK, RID_SBLANK_HELP}, {RID_BLANK, RID_BLANK_HELP}, - {RID_NOSPACE, RID_NOSPACE_HELP}, {RID_BINOMXY, RID_BINOMXY_HELP}, {RID_STACK, RID_STACK_HELP}, + {RID_NOSPACE, RID_NOSPACE_HELP}, + {RID_ALIGNLX, RID_ALIGNLX_HELP}, {RID_ALIGNCX, RID_ALIGNCX_HELP}, {RID_ALIGNRX, RID_ALIGNRX_HELP}, + {0xFFFF, 0}, + {RID_BINOMXY, RID_BINOMXY_HELP}, {RID_STACK, RID_STACK_HELP}, {RID_MATRIX, RID_MATRIX_HELP}, }; @@ -479,6 +483,12 @@ void SmElementsControl::addElements(const sal_uInt16 aElementsArray[][2], sal_uI addElement(OUString("color magenta { \"" + colorMagenta() + "\" }"), SmResId(aElementId), SmResId(aElementIdHelp)); else if (aElementId == RID_COLORX_YELLOW) addElement(OUString("color yellow { \"" + colorYellow() + "\" }"), SmResId(aElementId), SmResId(aElementIdHelp)); + else if (aElementId == RID_ALIGNLX) + addElement("\"" + SM_RESSTR(STR_ALIGN_LEFT) + "\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); + else if (aElementId == RID_ALIGNCX) + addElement("\"" + SM_RESSTR(STR_ALIGN_CENTER) + "\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); + else if (aElementId == RID_ALIGNRX) + addElement("\"" + SM_RESSTR(STR_ALIGN_RIGHT) + "\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); else addElement(SmResId(aElementId), SmResId(aElementId), SmResId(aElementIdHelp)); } diff --git a/starmath/source/commands.src b/starmath/source/commands.src index 848464dca7dc..725356325fa1 100644 --- a/starmath/source/commands.src +++ b/starmath/source/commands.src @@ -17,13 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/sfx.hrc> #include "starmath.hrc" - -//////////////////////////////////////////////////////////// - String RID_PLUSX { Text = "+<?> " ; }; String RID_PLUSX_HELP { Text = "+ Sign" ; }; String RID_MINUSX { Text = "-<?> " ; }; @@ -76,7 +72,9 @@ String RID_XLESLANTY_HELP { Text = "Is Less Than Or Equal To" ; }; String RID_XGESLANTY { Text = "<?> geslant <?> " ; }; String RID_XGESLANTY_HELP { Text = "Is Greater Than Or Equal To" ; }; String RID_XLLY { Text = "<?> << <?> " ; }; +String RID_XLLY_HELP { Text = "Is Much Less Than" ; }; String RID_XGGY { Text = "<?> >> <?> " ; }; +String RID_XGGY_HELP { Text = "Is Much Greater Than" ; }; String RID_XDEFY { Text = "<?> def <?> " ; }; String RID_XEQUIVY { Text = "<?> equiv <?> " ; }; String RID_XEQUIVY_HELP { Text = "Is Congruent To" ; }; @@ -266,7 +264,7 @@ String RID_FROMX { Text = "from{<?>} <?> " ; }; String RID_TOX { Text = "to{<?>} <?> " ; }; String RID_FROMXTOY { Text = "from{<?>} to{<?>} <?> " ; }; String RID_ACUTEX { Text = "acute <?> " ; }; -String RID_ACUTEX_HELP { Text = "Acute Accent" ; }; +String RID_ACUTEX_HELP { Text = "Acute Accent" ; }; String RID_BARX { Text = "bar <?> " ; }; String RID_BARX_HELP { Text = "Line Above" ; }; String RID_BREVEX { Text = "breve <?> " ; }; @@ -389,8 +387,11 @@ String RID_STACK_HELP { Text = "Vertical Stack" ; }; String RID_MATRIX { Text = "matrix{<?> # <?> ## <?> # <?>} " ; }; String RID_MATRIX_HELP { Text = "Matrix Stack" ; }; String RID_ALIGNLX { Text = "alignl <?> " ; }; +String RID_ALIGNLX_HELP { Text = "Align Right" ; }; String RID_ALIGNCX { Text = "alignc <?> " ; }; +String RID_ALIGNCX_HELP { Text = "Align Center" ; }; String RID_ALIGNRX { Text = "alignr <?> " ; }; +String RID_ALIGNRX_HELP { Text = "Align Right" ; }; String RID_ALEPH { Text = "aleph " ; }; String RID_ALEPH_HELP { Text = "Aleph" ; }; String RID_EMPTYSET { Text = "emptyset " ; }; diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 6d0d1263bd49..62c5bd34998c 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -437,6 +437,18 @@ DockingWindow RID_ELEMENTSDOCKINGWINDOW }; }; +String STR_ALIGN_LEFT +{ + Text [ en-US ] = "left" ; +}; +String STR_ALIGN_CENTER +{ + Text [ en-US ] = "center" ; +}; +String STR_ALIGN_RIGHT +{ + Text [ en-US ] = "right" ; +}; String STR_CMDBOXWINDOW { |