summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorMarcos Paulo de Souza <marcos.souza.org@gmail.com>2014-11-15 19:57:43 -0200
committerMarcos Paulo de Souza <marcos.souza.org@gmail.com>2014-11-15 22:07:35 +0000
commit2ff1cc856a1d884187d8667e4f4b24d82c56b2c4 (patch)
treec00e03c8799e60f034516fad69306da1416241b9 /starmath
parentf8782d8ca17a91527e1a72def32a127095cfa7ef (diff)
Math: Remove aqua and fuchsia from the Elements Dock
We can remove these colors from the UI because these colors are equal to cyan and magenta, and will be useful just in the import/exports filters. If the user still wants to use aqua and fuchsia, they can type them in the Math editor. Change-Id: Ia93d458e07b218aa007ec43bd490f774e5b4ea5b Reviewed-on: https://gerrit.libreoffice.org/12467 Reviewed-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com> Tested-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/source/ElementsDockingWindow.cxx7
1 files changed, 1 insertions, 6 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index ac296444c21e..4b2cd4a50152 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -163,8 +163,7 @@ const sal_uInt16 SmElementsControl::aAttributes[][2] =
{RID_COLORX_BLACK, RID_COLORX_BLACK_HELP}, {RID_COLORX_BLUE, RID_COLORX_BLUE_HELP},
{RID_COLORX_GREEN, RID_COLORX_GREEN_HELP}, {RID_COLORX_RED, RID_COLORX_RED_HELP},
{RID_COLORX_CYAN, RID_COLORX_CYAN_HELP}, {RID_COLORX_MAGENTA, RID_COLORX_MAGENTA_HELP},
- {RID_COLORX_YELLOW, RID_COLORX_YELLOW_HELP}, {RID_COLORX_AQUA, RID_COLORX_AQUA_HELP},
- {RID_COLORX_FUCHSIA, RID_COLORX_FUCHSIA_HELP}, {RID_COLORX_GRAY, RID_COLORX_GRAY_HELP},
+ {RID_COLORX_YELLOW, RID_COLORX_YELLOW_HELP}, {RID_COLORX_GRAY, RID_COLORX_GRAY_HELP},
{RID_COLORX_LIME, RID_COLORX_LIME_HELP}, {RID_COLORX_MAROON, RID_COLORX_MAROON_HELP},
{RID_COLORX_NAVY, RID_COLORX_NAVY_HELP}, {RID_COLORX_OLIVE, RID_COLORX_OLIVE_HELP},
{RID_COLORX_PURPLE, RID_COLORX_PURPLE_HELP}, {RID_COLORX_SILVER, RID_COLORX_SILVER_HELP},
@@ -516,10 +515,6 @@ void SmElementsControl::addElements(const sal_uInt16 aElementsArray[][2], sal_uI
addElement("color magenta { \"" + SM_RESSTR(STR_MAGENTA) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
else if (aElementId == RID_COLORX_YELLOW)
addElement("color yellow { \"" + SM_RESSTR(STR_YELLOW) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_AQUA)
- addElement("color aqua { \"" + SM_RESSTR(STR_AQUA) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
- else if (aElementId == RID_COLORX_FUCHSIA)
- addElement("color fuchsia { \"" + SM_RESSTR(STR_FUCHSIA) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
else if (aElementId == RID_COLORX_GRAY)
addElement("color gray { \"" + SM_RESSTR(STR_GRAY) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp));
else if (aElementId == RID_COLORX_LIME)