From c08dc58e470c788e8c8d2fa8e45e50f5fdcd8bb1 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Fri, 4 Aug 2023 12:02:13 +0300
Subject: 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>
---
sc/qa/unit/ucalc_sparkline.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'sc/qa')
diff --git a/sc/qa/unit/ucalc_sparkline.cxx b/sc/qa/unit/ucalc_sparkline.cxx
index cb9047267b81..e140a39d20b1 100644
--- a/sc/qa/unit/ucalc_sparkline.cxx
+++ b/sc/qa/unit/ucalc_sparkline.cxx
@@ -484,16 +484,16 @@ CPPUNIT_TEST_FIXTURE(SparklineTest, testUndoRedoEditSparklineGroup)
{
sc::SparklineAttributes& rAttibutes = pSparklineGroup->getAttributes();
rAttibutes.setType(sc::SparklineType::Column);
- rAttibutes.setColorSeries(model::ComplexColor::RGB(COL_YELLOW));
- rAttibutes.setColorAxis(model::ComplexColor::RGB(COL_GREEN));
+ rAttibutes.setColorSeries(model::ComplexColor::setRGB(COL_YELLOW));
+ rAttibutes.setColorAxis(model::ComplexColor::setRGB(COL_GREEN));
}
m_pDoc->CreateSparkline(ScAddress(0, 6, 0), pSparklineGroup);
sc::SparklineAttributes aNewAttributes;
aNewAttributes.setType(sc::SparklineType::Stacked);
- aNewAttributes.setColorSeries(model::ComplexColor::RGB(COL_BLACK));
- aNewAttributes.setColorAxis(model::ComplexColor::RGB(COL_BLUE));
+ aNewAttributes.setColorSeries(model::ComplexColor::setRGB(COL_BLACK));
+ aNewAttributes.setColorAxis(model::ComplexColor::setRGB(COL_BLUE));
sc::SparklineAttributes aInitialAttibutes(pSparklineGroup->getAttributes());
--
cgit