diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-08-04 12:02:13 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-12-31 04:55:55 +0100 |
| commit | c1cc47f8db2f5a5e9233481f7ebae9576ca0d83c (patch) | |
| tree | 68fa96d585d14077e849853a6142e1cf2c9bd8f0 /include | |
| parent | b20cb3e24235d495305a34ae7d2c52c5df69ccd7 (diff) | |
Rename ComplexColor::RGB to setRGB, to avoid conflict with Windows define
Affects Windows' no-pch builds.
Change-Id: Ifff401df40854f59760bd398c156a8837b528efe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155340
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161283
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/docmodel/color/ComplexColor.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/docmodel/color/ComplexColor.hxx b/include/docmodel/color/ComplexColor.hxx index 01f1dac0e703..7b0cc6c46e25 100644 --- a/include/docmodel/color/ComplexColor.hxx +++ b/include/docmodel/color/ComplexColor.hxx @@ -255,7 +255,7 @@ public: return seed; } - static model::ComplexColor RGB(Color const& rColor) + static model::ComplexColor setRGB(Color const& rColor) { model::ComplexColor aComplexColor; aComplexColor.setColor(rColor); |