StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #580 from pomer/master

Browse Source 
LibreOffice color names support
This commit is contained in:
Thomas Fussell 2021-08-22 09:04:11 -04:00 committed by GitHub
commit 3a279fcaab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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])
{
case 'C':
if (color == "Cyan")
if ((color == "Cyan") || (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));
@ -1364,11 +1364,11 @@ format_color number_format_parser::color_from_string(const std::string &color)
break;
case 'B':
if (color == "Black")
if ((color == "Black") || (color == "BLACK"))
{
return format_color::black;
}
else if (color == "Blue")
else if ((color == "Blue") || (color == "BLUE"))
{
return format_color::blue;
}
@ -1377,7 +1377,7 @@ format_color number_format_parser::color_from_string(const std::string &color)
break;
case 'G':
if (color == "Green")
if ((color == "Green") || (color == "GREEN"))
{
return format_color::green;
}
@ -1386,7 +1386,7 @@ format_color number_format_parser::color_from_string(const std::string &color)
break;
case 'W':
if (color == "White")
if ((color == "White") || (color == "WHITE"))
{
return format_color::white;
}
@ -1395,7 +1395,7 @@ format_color number_format_parser::color_from_string(const std::string &color)
break;
case 'M':
if (color == "Magenta")
if ((color == "Magenta") || (color == "MAGENTA"))
{
return format_color::magenta;
}
@ -1404,7 +1404,7 @@ format_color number_format_parser::color_from_string(const std::string &color)
break;
case 'Y':
if (color == "Yellow")
if ((color == "Yellow") || (color == "YELLOW"))
{
return format_color::yellow;
}
@ -1413,7 +1413,7 @@ format_color number_format_parser::color_from_string(const std::string &color)
break;
case 'R':
if (color == "Red")
if ((color == "Red") || (color == "RED"))
{
return format_color::red;
}