include/docmodel/color/ComplexColor.hxx | 2 +-
oox/source/drawingml/color.cxx | 2 +-
sc/qa/unit/ucalc_sparkline.cxx | 8 ++++----
sc/source/filter/xml/SparklineGroupsImportContext.cxx | 2 +-
sc/source/ui/sparklines/SparklineAttributes.cxx | 16 ++++++++--------
5 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit c08dc58e470c788e8c8d2fa8e45e50f5fdcd8bb1
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Aug 4 12:02:13 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Aug 4 12:49:44 2023 +0200
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.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/include/docmodel/color/ComplexColor.hxx
b/include/docmodel/color/ComplexColor.hxx
index 88ff7a42a478..1b93e34f7442 100644
--- a/include/docmodel/color/ComplexColor.hxx
+++ b/include/docmodel/color/ComplexColor.hxx
@@ -247,7 +247,7 @@ public:
return seed;
}
- static model::ComplexColor RGB(Color const& rColor)
+ static model::ComplexColor setRGB(Color const& rColor)
{
model::ComplexColor aComplexColor;
aComplexColor.setColor(rColor);
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
{
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());
diff --git a/sc/source/filter/xml/SparklineGroupsImportContext.cxx
b/sc/source/filter/xml/SparklineGroupsImportContext.cxx
index 59c24cdd45a4..9292798a6f14 100644
--- a/sc/source/filter/xml/SparklineGroupsImportContext.cxx
+++ b/sc/source/filter/xml/SparklineGroupsImportContext.cxx
@@ -363,7 +363,7 @@ model::ComplexColor
combineComplexColorAndColor(model::ComplexColor& rComplexCol
if (rComplexColor.getType() != model::ColorType::Unused)
rComplexColor.setFinalColor(aColor);
else if (aColor != COL_TRANSPARENT)
- rComplexColor = model::ComplexColor::RGB(aColor);
+ rComplexColor = model::ComplexColor::setRGB(aColor);
return rComplexColor;
}
} // end anonymous namespace
diff --git a/sc/source/ui/sparklines/SparklineAttributes.cxx
b/sc/source/ui/sparklines/SparklineAttributes.cxx
index 080c38f5ee64..31fd2daf3fdc 100644
--- a/sc/source/ui/sparklines/SparklineAttributes.cxx
+++ b/sc/source/ui/sparklines/SparklineAttributes.cxx
@@ -52,14 +52,14 @@ public:
static constexpr Color COL_STANDARD_BLUE = 0x2a6099;
Implementation()
- : m_aColorSeries(model::ComplexColor::RGB(COL_STANDARD_BLUE))
- , m_aColorNegative(model::ComplexColor::RGB(COL_STANDARD_RED))
- , m_aColorAxis(model::ComplexColor::RGB(COL_STANDARD_RED))
- , m_aColorMarkers(model::ComplexColor::RGB(COL_STANDARD_RED))
- , m_aColorFirst(model::ComplexColor::RGB(COL_STANDARD_RED))
- , m_aColorLast(model::ComplexColor::RGB(COL_STANDARD_RED))
- , m_aColorHigh(model::ComplexColor::RGB(COL_STANDARD_RED))
- , m_aColorLow(model::ComplexColor::RGB(COL_STANDARD_RED))
+ : m_aColorSeries(model::ComplexColor::setRGB(COL_STANDARD_BLUE))
+ , m_aColorNegative(model::ComplexColor::setRGB(COL_STANDARD_RED))
+ , m_aColorAxis(model::ComplexColor::setRGB(COL_STANDARD_RED))
+ , m_aColorMarkers(model::ComplexColor::setRGB(COL_STANDARD_RED))
+ , m_aColorFirst(model::ComplexColor::setRGB(COL_STANDARD_RED))
+ , m_aColorLast(model::ComplexColor::setRGB(COL_STANDARD_RED))
+ , m_aColorHigh(model::ComplexColor::setRGB(COL_STANDARD_RED))
+ , m_aColorLow(model::ComplexColor::setRGB(COL_STANDARD_RED))
, m_eMinAxisType(AxisType::Individual)
, m_eMaxAxisType(AxisType::Individual)
, m_fLineWeight(0.75)
