diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-08-04 12:02:13 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-08-04 12:49:44 +0200 |
| commit | c08dc58e470c788e8c8d2fa8e45e50f5fdcd8bb1 (patch) | |
| tree | df41def1c24756b2368683e05065ff9045ac27e4 /oox | |
| parent | c545a0729e89ee2e8f14534b77422cc9eb4eb7cf (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>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/color.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index e582d4e53c77..79d27d8b21cb 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -828,7 +828,7 @@ model::ComplexColor Color::createComplexColor(const GraphicHelper& /*rGraphicHel else if (meMode == COLOR_RGB) { ::Color aColor(ColorTransparency, lclRgbComponentsToRgb(mnC1, mnC2, mnC3)); - aNewComplexColor = model::ComplexColor::RGB(aColor); + aNewComplexColor = model::ComplexColor::setRGB(aColor); } else { |