From d3510bef84423f17ece0715b7a8cdb75725c5938 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 27 Feb 2018 17:18:39 +0200 Subject: make Color::GetRGBColor return Color instead of ColorData Change-Id: I532959a7103c3857510f26ecce2f942d676a233b Reviewed-on: https://gerrit.libreoffice.org/50487 Tested-by: Jenkins Reviewed-by: Noel Grandin --- dbaccess/source/ui/misc/HtmlReader.cxx | 2 +- dbaccess/source/ui/misc/RtfReader.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 2892205962e1..e195bc716b4f 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -331,7 +331,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor) { Color aColor; rOption.GetColor( aColor ); - _rTextColor = aColor.GetRGBColor(); + _rTextColor = sal_Int32(aColor.GetRGBColor()); } break; case HtmlOptionId::FACE : diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 0c0d6d6edc65..ed0b2da1cd3e 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -122,7 +122,7 @@ void ORTFReader::NextToken( int nToken ) nTmpToken2 = GetNextToken(); } while(aToken[0] != ';' && eState != SvParserState::Error && eState != SvParserState::Accepted); - m_vecColor.push_back(aColor.GetRGBColor()); + m_vecColor.push_back(sal_uInt32(aColor.GetRGBColor())); nTmpToken2 = GetNextToken(); } while(nTmpToken2 == RTF_RED && eState != SvParserState::Error && eState != SvParserState::Accepted); -- cgit