diff options
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/inc/starmath.hrc | 31 | ||||
-rw-r--r-- | starmath/source/ElementsDockingWindow.cxx | 27 | ||||
-rw-r--r-- | starmath/source/commands.src | 51 | ||||
-rw-r--r-- | starmath/source/smres.src | 41 |
4 files changed, 149 insertions, 1 deletions
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index ae9cafb4cf39..e5aab1968642 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -113,6 +113,16 @@ #define STR_ALIGN_LEFT (RID_APP_START + 836) #define STR_ALIGN_CENTER (RID_APP_START + 837) #define STR_ALIGN_RIGHT (RID_APP_START + 838) +#define STR_AQUA (RID_APP_START + 839) +#define STR_FUCHSIA (RID_APP_START + 840) +#define STR_GRAY (RID_APP_START + 841) +#define STR_LIME (RID_APP_START + 842) +#define STR_MAROON (RID_APP_START + 843) +#define STR_NAVY (RID_APP_START + 844) +#define STR_OLIVE (RID_APP_START + 845) +#define STR_PURPLE (RID_APP_START + 846) +#define STR_SILVER (RID_APP_START + 847) +#define STR_TEAL (RID_APP_START + 848) #define RID_ERR_IDENT (RID_APP_START + 920) #define RID_ERR_UNKNOWN (RID_APP_START + 921) @@ -401,6 +411,16 @@ #define RID_COLORX_CYAN (RID_APP_START + 1729) #define RID_COLORX_MAGENTA (RID_APP_START + 1730) #define RID_COLORX_YELLOW (RID_APP_START + 1731) +#define RID_COLORX_AQUA (RID_APP_START + 1732) +#define RID_COLORX_FUCHSIA (RID_APP_START + 1733) +#define RID_COLORX_GRAY (RID_APP_START + 1734) +#define RID_COLORX_LIME (RID_APP_START + 1735) +#define RID_COLORX_MAROON (RID_APP_START + 1736) +#define RID_COLORX_NAVY (RID_APP_START + 1737) +#define RID_COLORX_OLIVE (RID_APP_START + 1738) +#define RID_COLORX_PURPLE (RID_APP_START + 1739) +#define RID_COLORX_SILVER (RID_APP_START + 1740) +#define RID_COLORX_TEAL (RID_APP_START + 1741) #define RID_LRPARENTX (RID_APP_START + 1801) #define RID_LRBRACKETX (RID_APP_START + 1802) @@ -676,6 +696,17 @@ #define RID_LLINT_FROMTOX_HELP (RID_APP_START + 4189) #define RID_LLLINT_FROMTOX_HELP (RID_APP_START + 4190) +#define RID_COLORX_AQUA_HELP (RID_APP_START + 4191) +#define RID_COLORX_FUCHSIA_HELP (RID_APP_START + 4192) +#define RID_COLORX_GRAY_HELP (RID_APP_START + 4193) +#define RID_COLORX_LIME_HELP (RID_APP_START + 4194) +#define RID_COLORX_MAROON_HELP (RID_APP_START + 4195) +#define RID_COLORX_NAVY_HELP (RID_APP_START + 4196) +#define RID_COLORX_OLIVE_HELP (RID_APP_START + 4197) +#define RID_COLORX_PURPLE_HELP (RID_APP_START + 4198) +#define RID_COLORX_SILVER_HELP (RID_APP_START + 4199) +#define RID_COLORX_TEAL_HELP (RID_APP_START + 4200) + #define RID_ALIGNLX_HELP (RID_APP_START + 4275) #define RID_ALIGNCX_HELP (RID_APP_START + 4276) #define RID_ALIGNRX_HELP (RID_APP_START + 4277) diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 5b5a8339ea4f..ac296444c21e 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -163,7 +163,12 @@ 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_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_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}, + {RID_COLORX_TEAL, RID_COLORX_TEAL_HELP} }; const sal_uInt16 SmElementsControl::aBrackets[][2] = @@ -511,6 +516,26 @@ 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) + addElement("color lime { \"" + SM_RESSTR(STR_LIME) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); + else if (aElementId == RID_COLORX_MAROON) + addElement("color maroon { \"" + SM_RESSTR(STR_MAROON) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); + else if (aElementId == RID_COLORX_NAVY) + addElement("color navy { \"" + SM_RESSTR(STR_NAVY) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); + else if (aElementId == RID_COLORX_OLIVE) + addElement("color olive { \"" + SM_RESSTR(STR_OLIVE) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); + else if (aElementId == RID_COLORX_PURPLE) + addElement("color purple { \"" + SM_RESSTR(STR_PURPLE) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); + else if (aElementId == RID_COLORX_SILVER) + addElement("color silver { \"" + SM_RESSTR(STR_SILVER) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); + else if (aElementId == RID_COLORX_TEAL) + addElement("color teal { \"" + SM_RESSTR(STR_TEAL) + "\" }", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); else if (aElementId == RID_ALIGNLX) addElement("\"" + SM_RESSTR(STR_ALIGN_LEFT) + "\"", SM_RESSTR(aElementId), SM_RESSTR(aElementIdHelp)); else if (aElementId == RID_ALIGNCX) diff --git a/starmath/source/commands.src b/starmath/source/commands.src index 0c2203d9e384..f758d2d7ad2b 100644 --- a/starmath/source/commands.src +++ b/starmath/source/commands.src @@ -739,11 +739,62 @@ String RID_COLORX_MAGENTA_HELP { Text [ en-US ] = "Color Magenta" ; }; +String RID_COLORX_AQUA { Text = "color aqua {<?>} " ; }; +String RID_COLORX_AQUA_HELP +{ + Text [ en-US ] = "Color Aqua" ; +}; +String RID_COLORX_FUCHSIA { Text = "color fuchsia {<?>} " ; }; +String RID_COLORX_FUCHSIA_HELP +{ + Text [ en-US ] = "Color Fuchsia" ; +}; +String RID_COLORX_GRAY { Text = "color gray {<?>} " ; }; +String RID_COLORX_GRAY_HELP +{ + Text [ en-US ] = "Color Gray" ; +}; +String RID_COLORX_LIME { Text = "color lime {<?>} " ; }; +String RID_COLORX_LIME_HELP +{ + Text [ en-US ] = "Color Lime" ; +}; +String RID_COLORX_MAROON { Text = "color maroon {<?>} " ; }; +String RID_COLORX_MAROON_HELP +{ + Text [ en-US ] = "Color Maroon" ; +}; +String RID_COLORX_NAVY { Text = "color navy {<?>} " ; }; +String RID_COLORX_NAVY_HELP +{ + Text [ en-US ] = "Color Navy" ; +}; +String RID_COLORX_OLIVE { Text = "color olive {<?>} " ; }; +String RID_COLORX_OLIVE_HELP +{ + Text [ en-US ] = "Color Olive" ; +}; +String RID_COLORX_PURPLE { Text = "color purple {<?>} " ; }; +String RID_COLORX_PURPLE_HELP +{ + Text [ en-US ] = "Color Purple" ; +}; +String RID_COLORX_SILVER { Text = "color silver {<?>} " ; }; +String RID_COLORX_SILVER_HELP +{ + Text [ en-US ] = "Color Silver" ; +}; +String RID_COLORX_TEAL { Text = "color teal {<?>} " ; }; +String RID_COLORX_TEAL_HELP +{ + Text [ en-US ] = "Color Teal" ; +}; String RID_COLORX_YELLOW { Text = "color yellow {<?>} " ; }; String RID_COLORX_YELLOW_HELP { Text [ en-US ] = "Color Yellow" ; }; + String RID_LRGROUPX { Text = "{<?>} " ; }; String RID_LRGROUPX_HELP { diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 37649f092079..2e61fdf7efb8 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -178,6 +178,47 @@ String STR_MAGENTA { Text [ en-US ] = "magenta" ; }; +String STR_AQUA +{ + Text [ en-US ] = "aqua" ; +}; +String STR_FUCHSIA +{ + Text [ en-US ] = "funchsia" ; +}; +String STR_GRAY +{ + Text [ en-US ] = "gray" ; +}; +String STR_LIME +{ + Text [ en-US ] = "lime" ; +}; +String STR_MAROON +{ + Text [ en-US ] = "maroon" ; +}; +String STR_NAVY +{ + Text [ en-US ] = "navy" ; +}; +String STR_OLIVE +{ + Text [ en-US ] = "olive" ; +}; +String STR_PURPLE +{ + Text [ en-US ] = "purple" ; +}; +String STR_SILVER +{ + Text [ en-US ] = "silver" ; +}; +String STR_TEAL +{ + Text [ en-US ] = "teal" ; +}; + String STR_YELLOW { Text [ en-US ] = "yellow" ; |