StarMirror
/
xlnt
mirror of https://github.com/tfussell/xlnt
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

LibreOffice color names support

pull/580/head
Vladimir S. Yakovlev 2021-08-17 00:46:39 +03:00
parent 20f3dac28b
commit 99372e3f11
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/detail/number_format/number_formatter.cpp
View File

@ -1346,11 +1346,11 @@ format_color number_format_parser::color_from_string(const std::string &color)
switch (color[0]) switch (color[0])
{ {
case 'C': case 'C':
if (color == "Cyan") if ((color == "Cyan") || (color == "CYAN"))
{ {
return format_color::cyan; return format_color::cyan;
} }
else if (color.substr(0, 5) == "Color") else if ((color.substr(0, 5) == "Color") || (color.substr(0, 5) == "COLOR"))
{ {
auto color_number = std::stoull(color.substr(5)); auto color_number = std::stoull(color.substr(5));
@ -1364,11 +1364,11 @@ format_color number_format_parser::color_from_string(const std::string &color)
break; break;
case 'B': case 'B':
if (color == "Black") if ((color == "Black") || (color == "BLACK"))
{ {
return format_color::black; return format_color::black;
} }
else if (color == "Blue") else if ((color == "Blue") || (color == "BLUE"))
{ {
return format_color::blue; return format_color::blue;
} }
@ -1377,7 +1377,7 @@ format_color number_format_parser::color_from_string(const std::string &color)
break; break;
case 'G': case 'G':
if (color == "Green") if ((color == "Green") || (color == "GREEN"))
{ {
return format_color::green; return format_color::green;
} }
@ -1386,7 +1386,7 @@ format_color number_format_parser::color_from_string(const std::string &color)
break; break;
case 'W': case 'W':
if (color == "White") if ((color == "White") || (color == "WHITE"))
{ {
return format_color::white; return format_color::white;
} }
@ -1395,7 +1395,7 @@ format_color number_format_parser::color_from_string(const std::string &color)
break; break;
case 'M': case 'M':
if (color == "Magenta") if ((color == "Magenta") || (color == "MAGENTA"))
{ {
return format_color::magenta; return format_color::magenta;
} }
@ -1404,7 +1404,7 @@ format_color number_format_parser::color_from_string(const std::string &color)
break; break;
case 'Y': case 'Y':
if (color == "Yellow") if ((color == "Yellow") || (color == "YELLOW"))
{ {
return format_color::yellow; return format_color::yellow;
} }
@ -1413,7 +1413,7 @@ format_color number_format_parser::color_from_string(const std::string &color)
break; break;
case 'R': case 'R':
if (color == "Red") if ((color == "Red") || (color == "RED"))
{ {
return format_color::red; return format_color::red;
} }