From 7ca8a6c8b17ffb4727af2df295b82d33227bdcde Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 20 Feb 2018 10:55:31 +0200 Subject: create uno::Any overrides for Color And use less ColorData in writerfilter and xmloff. part of removing ColorData. Change-Id: Ia1c57bf837ae814e7642cf1c7de2eb7ada7a1500 Reviewed-on: https://gerrit.libreoffice.org/50028 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- xmloff/source/style/xmlnumfi.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index e918edcea82a..2e2905d6ffd0 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -283,7 +283,7 @@ enum SvXMLStyleElemAttrTokens #define XML_NUMF_COLORCOUNT 10 -static const ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] = +static const Color aNumFmtStdColors[XML_NUMF_COLORCOUNT] = { COL_BLACK, COL_LIGHTBLUE, @@ -2216,7 +2216,7 @@ void SvXMLNumFormatContext::AddCondition( const OUString& rCondition, const OUSt aMyConditions.push_back(aCondition); } -void SvXMLNumFormatContext::AddColor( sal_uInt32 const nColor ) +void SvXMLNumFormatContext::AddColor( Color const nColor ) { SvNumberFormatter* pFormatter = pData->GetNumberFormatter(); if (!pFormatter) -- cgit