diff options
| author | Regina Henschel <regina@apache.org> | 2014-10-30 18:41:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-31 13:04:17 +0000 |
| commit | fe5840aab17e366749c373e4f8683e06e40b4b05 (patch) | |
| tree | 0b31cc89dede495cfd1ce8b62e8c6a5290778313 /starmath/source/node.cxx | |
| parent | fa277f5952d719f0dbc880301343e6653548bd03 (diff) | |
Resolves: #i118191# Red is not red enough
Enable Math to use 16 basic HTML colors
Patch by: Regina Henschel <rb.henschel@t-online.de>
Found by: <lapsap7+ooo@gmail.com
(cherry picked from commit 529e59d90037748d0030191b93252e597935243e)
Conflicts:
starmath/inc/parse.hxx
starmath/source/mathmlimport.cxx
starmath/source/parse.cxx
Change-Id: I08de0ce33928ead3635a3a87c81671b4cc4112ac
Diffstat (limited to 'starmath/source/node.cxx')
| -rw-r--r-- | starmath/source/node.cxx | 56 |
1 files changed, 44 insertions, 12 deletions
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 06fdbf753175..7c93b1463011 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2015,12 +2015,6 @@ void SmAttributNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) ExtendBy(*pAttr, RCP_THIS, true); } - -/**************************************************************************/ - - - - void SmFontNode::CreateTextFromNode(OUString &rText) { switch (GetToken().eType) @@ -2092,6 +2086,36 @@ void SmFontNode::CreateTextFromNode(OUString &rText) case TYELLOW: rText += "color yellow "; break; + case TTEAL: + rText += "color teal"; + break; + case TSILVER: + rText += "color silver"; + break; + case TGRAY: + rText += "color gray"; + break; + case TMAROON: + rText += "color maroon"; + break; + case TPURPLE: + rText += "color purple"; + break; + case TLIME: + rText += "color lime"; + break; + case TOLIVE: + rText += "color olive"; + break; + case TNAVY: + rText += "color navy"; + break; + case TAQUA: + rText += "color aqua"; + break; + case TFUCHSIA: + rText += "color fuchsia"; + break; case TSANS: rText += "font sans "; break; @@ -2107,7 +2131,6 @@ void SmFontNode::CreateTextFromNode(OUString &rText) GetSubNode(1)->CreateTextFromNode(rText); } - void SmFontNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) { //! prepare subnodes first @@ -2132,7 +2155,6 @@ void SmFontNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) Flags() |= FLG_FONT; } - void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) { SmNode *pNode = GetSubNode(1); @@ -2157,12 +2179,22 @@ void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) case TBLACK : SetColor(Color(COL_BLACK)); break; case TWHITE : SetColor(Color(COL_WHITE)); break; - case TRED : SetColor(Color(COL_RED)); break; + case TRED : SetColor(Color(COL_LIGHTRED)); break; case TGREEN : SetColor(Color(COL_GREEN)); break; - case TBLUE : SetColor(Color(COL_BLUE)); break; - case TCYAN : SetColor(Color(COL_CYAN)); break; - case TMAGENTA : SetColor(Color(COL_MAGENTA)); break; + case TBLUE : SetColor(Color(COL_LIGHTBLUE)); break; + case TCYAN : SetColor(Color(COL_LIGHTCYAN)); break; // as in Calc + case TMAGENTA : SetColor(Color(COL_LIGHTMAGENTA)); break; // as in Calc case TYELLOW : SetColor(Color(COL_YELLOW)); break; + case TTEAL : SetColor(Color(COL_CYAN)); break; + case TSILVER : SetColor(Color(COL_LIGHTGRAY)); break; + case TGRAY : SetColor(Color(COL_GRAY)); break; + case TMAROON : SetColor(Color(COL_RED)); break; + case TPURPLE : SetColor(Color(COL_MAGENTA)); break; + case TLIME : SetColor(Color(COL_LIGHTGREEN)); break; + case TOLIVE : SetColor(Color(COL_BROWN)); break; + case TNAVY : SetColor(Color(COL_BLUE)); break; + case TAQUA : SetColor(Color(COL_LIGHTCYAN)); break; + case TFUCHSIA : SetColor(Color(COL_LIGHTMAGENTA)); break; default: SAL_WARN("starmath", "unknown case"); |