From f02b1ba18deeab9744c5fe25162f5853d69b438e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 6 Mar 2018 10:34:00 +0200 Subject: use more Color in xmloff Change-Id: Iec12d2e9f3e254dc6525dc285259321b13f75c4a Reviewed-on: https://gerrit.libreoffice.org/50794 Tested-by: Jenkins Reviewed-by: Noel Grandin --- xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xmloff/source/draw/XMLGraphicsDefaultStyle.cxx') diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 51c83ba96505..7c35e6258580 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -152,11 +152,11 @@ void XMLGraphicsDefaultStyle::SetDefaults() if (std::none_of(GetProperties().begin(), GetProperties().end(), XMLPropertyByIndex(nStrokeIndex))) { - sal_Int32 const nStroke( + Color const nStroke( bIsAOO4 ? Color(128, 128, 128) : COL_BLACK); xDefaults->setPropertyValue("LineColor", makeAny(nStroke)); } - sal_Int32 const nFillColor( bIsAOO4 + Color const nFillColor( bIsAOO4 ? Color(0xCF, 0xE7, 0xF5) : Color(153, 204, 255)); sal_Int32 const nFillIndex( pImpPrMap->GetEntryIndex(XML_NAMESPACE_DRAW, "fill-color", 0)); @@ -172,7 +172,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() if (std::none_of(GetProperties().begin(), GetProperties().end(), XMLPropertyByIndex(nFill2Index))) { - xDefaults->setPropertyValue("FillColor2", makeAny(nFillColor)); + xDefaults->setPropertyValue("FillColor2", makeAny(sal_Int32(nFillColor))); } } } -- cgit