include/tools/color.hxx | 100 ++++++++++++++++++++++++------------------------
1 file changed, 50 insertions(+), 50 deletions(-)
New commits:
commit 4e6b19b12ce26a28dd0f2730ee47cf13739f0957
Author: Sergey Fukanchik <fukanc...@gmail.com>
AuthorDate: Sun Jul 31 13:28:51 2022 -0400
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Oct 1 09:06:05 2022 +0200
Follow One Definition Rule for COL enum.
Change-Id: I97292df52c50e73b3f0d4ee9b5f8134959f3b7e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137653
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 0d4990b63eab..296d6064c40a 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -447,56 +447,56 @@ 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 );
-constexpr ::Color COL_CYAN ( 0x00, 0x80, 0x80 );
-constexpr ::Color COL_RED ( 0x80, 0x00, 0x00 );
-constexpr ::Color COL_MAGENTA ( 0x80, 0x00, 0x80 );
-constexpr ::Color COL_BROWN ( 0x80, 0x80, 0x00 );
-constexpr ::Color COL_GRAY ( 0x80, 0x80, 0x80 );
-constexpr ::Color COL_GRAY3 ( 0xCC, 0xCC, 0xCC );
-constexpr ::Color COL_GRAY7 ( 0x66, 0x66, 0x66 );
-constexpr ::Color COL_LIGHTGRAY ( 0xC0, 0xC0, 0xC0 );
-constexpr ::Color COL_LIGHTBLUE ( 0x00, 0x00, 0xFF );
-constexpr ::Color COL_LIGHTGREEN ( 0x00, 0xFF, 0x00 );
-constexpr ::Color COL_LIGHTCYAN ( 0x00, 0xFF, 0xFF );
-constexpr ::Color COL_LIGHTRED ( 0xFF, 0x00, 0x00 );
-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_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 );
-constexpr ::Color COL_AUTHOR_TABLE_INS ( 0xE1, 0xF2, 0xFA );
-constexpr ::Color COL_AUTHOR_TABLE_DEL ( 0xFC, 0xE6, 0xF4 );
+inline constexpr ::Color COL_TRANSPARENT ( ColorTransparency,
0xFF, 0xFF, 0xFF, 0xFF );
+inline constexpr ::Color COL_AUTO ( ColorTransparency,
0xFF, 0xFF, 0xFF, 0xFF );
+inline constexpr ::Color COL_BLACK ( 0x00, 0x00, 0x00 );
+inline constexpr ::Color COL_BLUE ( 0x00, 0x00, 0x80 );
+inline constexpr ::Color COL_GREEN ( 0x00, 0x80, 0x00 );
+inline constexpr ::Color COL_CYAN ( 0x00, 0x80, 0x80 );
+inline constexpr ::Color COL_RED ( 0x80, 0x00, 0x00 );
+inline constexpr ::Color COL_MAGENTA ( 0x80, 0x00, 0x80 );
+inline constexpr ::Color COL_BROWN ( 0x80, 0x80, 0x00 );
+inline constexpr ::Color COL_GRAY ( 0x80, 0x80, 0x80 );
+inline constexpr ::Color COL_GRAY3 ( 0xCC, 0xCC, 0xCC );
+inline constexpr ::Color COL_GRAY7 ( 0x66, 0x66, 0x66 );
+inline constexpr ::Color COL_LIGHTGRAY ( 0xC0, 0xC0, 0xC0 );
+inline constexpr ::Color COL_LIGHTBLUE ( 0x00, 0x00, 0xFF );
+inline constexpr ::Color COL_LIGHTGREEN ( 0x00, 0xFF, 0x00 );
+inline constexpr ::Color COL_LIGHTCYAN ( 0x00, 0xFF, 0xFF );
+inline constexpr ::Color COL_LIGHTRED ( 0xFF, 0x00, 0x00 );
+inline constexpr ::Color COL_LIGHTMAGENTA ( 0xFF, 0x00, 0xFF );
+inline constexpr ::Color COL_LIGHTGRAYBLUE ( 0xE0, 0xE0, 0xFF );
+inline constexpr ::Color COL_YELLOW ( 0xFF, 0xFF, 0x00 );
+inline constexpr ::Color COL_WHITE ( 0xFF, 0xFF, 0xFF );
+inline constexpr ::Color COL_AUTHOR1_DARK ( 0xC6, 0x92, 0x00 );
+inline constexpr ::Color COL_AUTHOR1_NORMAL ( 0xFF, 0xFF, 0x9E );
+inline constexpr ::Color COL_AUTHOR1_LIGHT ( 0xFF, 0xFF, 0xC3 );
+inline constexpr ::Color COL_AUTHOR2_DARK ( 0x06, 0x46, 0xA2 );
+inline constexpr ::Color COL_AUTHOR2_NORMAL ( 0xD8, 0xE8, 0xFF );
+inline constexpr ::Color COL_AUTHOR2_LIGHT ( 0xE9, 0xF2, 0xFF );
+inline constexpr ::Color COL_AUTHOR3_DARK ( 0x57, 0x9D, 0x1C );
+inline constexpr ::Color COL_AUTHOR3_NORMAL ( 0xDA, 0xF8, 0xC1 );
+inline constexpr ::Color COL_AUTHOR3_LIGHT ( 0xE2, 0xFA, 0xCF );
+inline constexpr ::Color COL_AUTHOR4_DARK ( 0x69, 0x2B, 0x9D );
+inline constexpr ::Color COL_AUTHOR4_NORMAL ( 0xE4, 0xD2, 0xF5 );
+inline constexpr ::Color COL_AUTHOR4_LIGHT ( 0xEF, 0xE4, 0xF8 );
+inline constexpr ::Color COL_AUTHOR5_DARK ( 0xC5, 0x00, 0x0B );
+inline constexpr ::Color COL_AUTHOR5_NORMAL ( 0xFE, 0xCD, 0xD0 );
+inline constexpr ::Color COL_AUTHOR5_LIGHT ( 0xFF, 0xE3, 0xE5 );
+inline constexpr ::Color COL_AUTHOR6_DARK ( 0x00, 0x80, 0x80 );
+inline constexpr ::Color COL_AUTHOR6_NORMAL ( 0xD2, 0xF6, 0xF6 );
+inline constexpr ::Color COL_AUTHOR6_LIGHT ( 0xE6, 0xFA, 0xFA );
+inline constexpr ::Color COL_AUTHOR7_DARK ( 0x8C, 0x84, 0x00 );
+inline constexpr ::Color COL_AUTHOR7_NORMAL ( 0xED, 0xFC, 0xA3 );
+inline constexpr ::Color COL_AUTHOR7_LIGHT ( 0xF2, 0xFE, 0xB5 );
+inline constexpr ::Color COL_AUTHOR8_DARK ( 0x35, 0x55, 0x6B );
+inline constexpr ::Color COL_AUTHOR8_NORMAL ( 0xD3, 0xDE, 0xE8 );
+inline constexpr ::Color COL_AUTHOR8_LIGHT ( 0xE2, 0xEA, 0xF1 );
+inline constexpr ::Color COL_AUTHOR9_DARK ( 0xD1, 0x76, 0x00 );
+inline constexpr ::Color COL_AUTHOR9_NORMAL ( 0xFF, 0xE2, 0xB9 );
+inline constexpr ::Color COL_AUTHOR9_LIGHT ( 0xFF, 0xE7, 0xC7 );
+inline constexpr ::Color COL_AUTHOR_TABLE_INS ( 0xE1, 0xF2, 0xFA );
+inline constexpr ::Color COL_AUTHOR_TABLE_DEL ( 0xFC, 0xE6, 0xF4 );
template<typename charT, typename traits>
inline std::basic_ostream<charT, traits>& operator
<<(std::basic_ostream<charT, traits>& rStream, const Color& rColor)
