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 6fc23af8d27585f9df0dd88509c241306ace9df2 Author: Mike Kaganski <[email protected]> AuthorDate: Fri Aug 4 16:34:49 2023 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Sun Dec 31 04:56:02 2023 +0100 Rename setRGB to createRGB to make it less misleading Somehow I overlooked completely, that there already is a non-static setRGB. Thanks Miklos and Tomaž for the heads up! Change-Id: If20018a317d90e0a6297950dff201671316aacad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155353 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161284 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/include/docmodel/color/ComplexColor.hxx b/include/docmodel/color/ComplexColor.hxx index 7b0cc6c46e25..0656ed8516e2 100644 --- a/include/docmodel/color/ComplexColor.hxx +++ b/include/docmodel/color/ComplexColor.hxx @@ -255,7 +255,7 @@ public: return seed; } - static model::ComplexColor setRGB(Color const& rColor) + static model::ComplexColor createRGB(Color const& rColor) { model::ComplexColor aComplexColor; aComplexColor.setColor(rColor); diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index c2d9c3993444..831ae8c02efe 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -826,7 +826,7 @@ model::ComplexColor Color::createComplexColor(const GraphicHelper& /*rGraphicHel else if (meMode == COLOR_RGB) { ::Color aColor(ColorTransparency, lclRgbComponentsToRgb(mnC1, mnC2, mnC3)); - aNewComplexColor = model::ComplexColor::setRGB(aColor); + aNewComplexColor = model::ComplexColor::createRGB(aColor); } else { diff --git a/sc/qa/unit/ucalc_sparkline.cxx b/sc/qa/unit/ucalc_sparkline.cxx index e41acf33c625..6e47783e7dd6 100644 --- a/sc/qa/unit/ucalc_sparkline.cxx +++ b/sc/qa/unit/ucalc_sparkline.cxx @@ -515,16 +515,16 @@ void SparklineTest::testUndoRedoEditSparklineGroup() { sc::SparklineAttributes& rAttibutes = pSparklineGroup->getAttributes(); rAttibutes.setType(sc::SparklineType::Column); - rAttibutes.setColorSeries(model::ComplexColor::setRGB(COL_YELLOW)); - rAttibutes.setColorAxis(model::ComplexColor::setRGB(COL_GREEN)); + rAttibutes.setColorSeries(model::ComplexColor::createRGB(COL_YELLOW)); + rAttibutes.setColorAxis(model::ComplexColor::createRGB(COL_GREEN)); } m_pDoc->CreateSparkline(ScAddress(0, 6, 0), pSparklineGroup); sc::SparklineAttributes aNewAttributes; aNewAttributes.setType(sc::SparklineType::Stacked); - aNewAttributes.setColorSeries(model::ComplexColor::setRGB(COL_BLACK)); - aNewAttributes.setColorAxis(model::ComplexColor::setRGB(COL_BLUE)); + aNewAttributes.setColorSeries(model::ComplexColor::createRGB(COL_BLACK)); + aNewAttributes.setColorAxis(model::ComplexColor::createRGB(COL_BLUE)); sc::SparklineAttributes aInitialAttibutes(pSparklineGroup->getAttributes()); diff --git a/sc/source/filter/xml/SparklineGroupsImportContext.cxx b/sc/source/filter/xml/SparklineGroupsImportContext.cxx index 9292798a6f14..4f85ae1108c1 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::setRGB(aColor); + rComplexColor = model::ComplexColor::createRGB(aColor); return rComplexColor; } } // end anonymous namespace diff --git a/sc/source/ui/sparklines/SparklineAttributes.cxx b/sc/source/ui/sparklines/SparklineAttributes.cxx index 31fd2daf3fdc..8a615c1f7b00 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::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_aColorSeries(model::ComplexColor::createRGB(COL_STANDARD_BLUE)) + , m_aColorNegative(model::ComplexColor::createRGB(COL_STANDARD_RED)) + , m_aColorAxis(model::ComplexColor::createRGB(COL_STANDARD_RED)) + , m_aColorMarkers(model::ComplexColor::createRGB(COL_STANDARD_RED)) + , m_aColorFirst(model::ComplexColor::createRGB(COL_STANDARD_RED)) + , m_aColorLast(model::ComplexColor::createRGB(COL_STANDARD_RED)) + , m_aColorHigh(model::ComplexColor::createRGB(COL_STANDARD_RED)) + , m_aColorLow(model::ComplexColor::createRGB(COL_STANDARD_RED)) , m_eMinAxisType(AxisType::Individual) , m_eMaxAxisType(AxisType::Individual) , m_fLineWeight(0.75) commit c1cc47f8db2f5a5e9233481f7ebae9576ca0d83c Author: Mike Kaganski <[email protected]> AuthorDate: Fri Aug 4 12:02:13 2023 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Sun Dec 31 04:55:55 2023 +0100 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 <[email protected]> Reviewed-by: Mike Kaganski <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161283 Tested-by: Jenkins CollaboraOffice <[email protected]> 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); diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index 2a5b12d21504..c2d9c3993444 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -826,7 +826,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 cf5e985fd322..e41acf33c625 100644 --- a/sc/qa/unit/ucalc_sparkline.cxx +++ b/sc/qa/unit/ucalc_sparkline.cxx @@ -515,16 +515,16 @@ void 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)
