include/tools/color.hxx | 58 ++++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 5a3f9ff4b6bd4a351efbdf0226aad03eba9456be
Author: Hossein <hoss...@libreoffice.org>
AuthorDate: Sun Aug 15 21:52:20 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 17 09:05:05 2021 +0200
Converted Color type input parameters to hex values
Used a script to convert Color type input parameters from base 10
to hexadecimal values. Also, Used a script to convert them back to
make sure the values are correct. The result of converting back and
forth showed that the conversion is done correctly.
Previously, some of the Color type input parameters were in hex, and
some of them were in base 10.
Change-Id: I95a465a2cb603580dee6404c53a9981f5cc5cb38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120516
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 4c75f5852aab..a34b55863701 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -443,6 +443,8 @@ static_assert (sal_uInt32(Color(0x12, 0x34, 0x56)) ==
0x00123456);
// Color types
+constexpr ::Color COL_TRANSPARENT ( ColorTransparency, 0xFF, 0xFF,
0xFF, 0xFF );
+constexpr ::Color COL_AUTO ( ColorTransparency, 0xFF, 0xFF,
0xFF, 0xFF );
constexpr ::Color COL_BLACK ( 0x00, 0x00, 0x00 );
constexpr ::Color COL_BLUE ( 0x00, 0x00, 0x80 );
constexpr ::Color COL_GREEN ( 0x00, 0x80, 0x00 );
@@ -462,35 +464,33 @@ constexpr ::Color COL_LIGHTMAGENTA ( 0xFF,
0x00, 0xFF );
constexpr ::Color COL_LIGHTGRAYBLUE ( 0xE0, 0xE0, 0xFF );
constexpr ::Color COL_YELLOW ( 0xFF, 0xFF, 0x00 );
constexpr ::Color COL_WHITE ( 0xFF, 0xFF, 0xFF );
-constexpr ::Color COL_TRANSPARENT ( ColorTransparency, 0xFF, 0xFF,
0xFF, 0xFF );
-constexpr ::Color COL_AUTO ( ColorTransparency, 0xFF, 0xFF,
0xFF, 0xFF );
-constexpr ::Color COL_AUTHOR1_DARK ( 198, 146, 0 );
-constexpr ::Color COL_AUTHOR1_NORMAL ( 255, 255, 158 );
-constexpr ::Color COL_AUTHOR1_LIGHT ( 255, 255, 195 );
-constexpr ::Color COL_AUTHOR2_DARK ( 6, 70, 162 );
-constexpr ::Color COL_AUTHOR2_NORMAL ( 216, 232, 255 );
-constexpr ::Color COL_AUTHOR2_LIGHT ( 233, 242, 255 );
-constexpr ::Color COL_AUTHOR3_DARK ( 87, 157, 28 );
-constexpr ::Color COL_AUTHOR3_NORMAL ( 218, 248, 193 );
-constexpr ::Color COL_AUTHOR3_LIGHT ( 226, 250, 207 );
-constexpr ::Color COL_AUTHOR4_DARK ( 105, 43, 157 );
-constexpr ::Color COL_AUTHOR4_NORMAL ( 228, 210, 245 );
-constexpr ::Color COL_AUTHOR4_LIGHT ( 239, 228, 248 );
-constexpr ::Color COL_AUTHOR5_DARK ( 197, 0, 11 );
-constexpr ::Color COL_AUTHOR5_NORMAL ( 254, 205, 208 );
-constexpr ::Color COL_AUTHOR5_LIGHT ( 255, 227, 229 );
-constexpr ::Color COL_AUTHOR6_DARK ( 0, 128, 128 );
-constexpr ::Color COL_AUTHOR6_NORMAL ( 210, 246, 246 );
-constexpr ::Color COL_AUTHOR6_LIGHT ( 230, 250, 250 );
-constexpr ::Color COL_AUTHOR7_DARK ( 140, 132, 0 );
-constexpr ::Color COL_AUTHOR7_NORMAL ( 237, 252, 163 );
-constexpr ::Color COL_AUTHOR7_LIGHT ( 242, 254, 181 );
-constexpr ::Color COL_AUTHOR8_DARK ( 53, 85, 107 );
-constexpr ::Color COL_AUTHOR8_NORMAL ( 211, 222, 232 );
-constexpr ::Color COL_AUTHOR8_LIGHT ( 226, 234, 241 );
-constexpr ::Color COL_AUTHOR9_DARK ( 209, 118, 0 );
-constexpr ::Color COL_AUTHOR9_NORMAL ( 255, 226, 185 );
-constexpr ::Color COL_AUTHOR9_LIGHT ( 255, 231, 199 );
+constexpr ::Color COL_AUTHOR1_DARK ( 0xC6, 0x92, 0x00 );
+constexpr ::Color COL_AUTHOR1_NORMAL ( 0xFF, 0xFF, 0x9E );
+constexpr ::Color COL_AUTHOR1_LIGHT ( 0xFF, 0xFF, 0xC3 );
+constexpr ::Color COL_AUTHOR2_DARK ( 0x06, 0x46, 0xA2 );
+constexpr ::Color COL_AUTHOR2_NORMAL ( 0xD8, 0xE8, 0xFF );
+constexpr ::Color COL_AUTHOR2_LIGHT ( 0xE9, 0xF2, 0xFF );
+constexpr ::Color COL_AUTHOR3_DARK ( 0x57, 0x9D, 0x1C );
+constexpr ::Color COL_AUTHOR3_NORMAL ( 0xDA, 0xF8, 0xC1 );
+constexpr ::Color COL_AUTHOR3_LIGHT ( 0xE2, 0xFA, 0xCF );
+constexpr ::Color COL_AUTHOR4_DARK ( 0x69, 0x2B, 0x9D );
+constexpr ::Color COL_AUTHOR4_NORMAL ( 0xE4, 0xD2, 0xF5 );
+constexpr ::Color COL_AUTHOR4_LIGHT ( 0xEF, 0xE4, 0xF8 );
+constexpr ::Color COL_AUTHOR5_DARK ( 0xC5, 0x00, 0x0B );
+constexpr ::Color COL_AUTHOR5_NORMAL ( 0xFE, 0xCD, 0xD0 );
+constexpr ::Color COL_AUTHOR5_LIGHT ( 0xFF, 0xE3, 0xE5 );
+constexpr ::Color COL_AUTHOR6_DARK ( 0x00, 0x80, 0x80 );
+constexpr ::Color COL_AUTHOR6_NORMAL ( 0xD2, 0xF6, 0xF6 );
+constexpr ::Color COL_AUTHOR6_LIGHT ( 0xE6, 0xFA, 0xFA );
+constexpr ::Color COL_AUTHOR7_DARK ( 0x8C, 0x84, 0x00 );
+constexpr ::Color COL_AUTHOR7_NORMAL ( 0xED, 0xFC, 0xA3 );
+constexpr ::Color COL_AUTHOR7_LIGHT ( 0xF2, 0xFE, 0xB5 );
+constexpr ::Color COL_AUTHOR8_DARK ( 0x35, 0x55, 0x6B );
+constexpr ::Color COL_AUTHOR8_NORMAL ( 0xD3, 0xDE, 0xE8 );
+constexpr ::Color COL_AUTHOR8_LIGHT ( 0xE2, 0xEA, 0xF1 );
+constexpr ::Color COL_AUTHOR9_DARK ( 0xD1, 0x76, 0x00 );
+constexpr ::Color COL_AUTHOR9_NORMAL ( 0xFF, 0xE2, 0xB9 );
+constexpr ::Color COL_AUTHOR9_LIGHT ( 0xFF, 0xE7, 0xC7 );
template<typename charT, typename traits>
inline std::basic_ostream<charT, traits>& operator
<<(std::basic_ostream<charT, traits>& rStream, const Color& rColor)
