From c89ba1dedc511ec17df1e35f8e0696bc20121491 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Mon, 2 Nov 2015 00:46:29 +0100 Subject: tdf#95510: SVG: Import stop-color and stop-opacity Change-Id: Ie073ff3e92c9344a78badfeefa0afed2c2b76fb8 Reviewed-on: https://gerrit.libreoffice.org/19731 Tested-by: Jenkins Reviewed-by: Katarina Behrens --- filter/source/svg/svgreader.cxx | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'filter') diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index b4d84e639dd1..ce94e0fdff66 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -816,6 +816,21 @@ struct AnnotatingVisitor case XML_ID: maStopIdMap.insert(std::make_pair(sValue,nStopNumber)); break; + case XML_STOP_COLOR: + if( maGradientVector.empty() || + maGradientVector.back().maStops.empty() ) + break; + parseColor( sValue.toUtf8().getStr(), maGradientStopVector[ + maGradientVector.back().maStops.back()].maStopColor ); + break; + case XML_STOP_OPACITY: + if( maGradientVector.empty() || + maGradientVector.back().maStops.empty() ) + break; + parseOpacity( sValue.toUtf8().getStr(), + maGradientStopVector[ + maGradientVector.back().maStops.back()].maStopColor ); + break; case XML_OFFSET: io_rGradientStop.mnStopPosition = sValue.toDouble(); break; @@ -1022,22 +1037,6 @@ struct AnnotatingVisitor case XML_TEXT_ANCHOR: parseTextAlign(maCurrState,aValueUtf8.getStr()); break; - case XML_STOP_COLOR: - if( maGradientVector.empty() || - maGradientVector.back().maStops.empty() ) - break; - parseColor( aValueUtf8.getStr(), - maGradientStopVector[ - maGradientVector.back().maStops.back()].maStopColor ); - break; - case XML_STOP_OPACITY: - if( maGradientVector.empty() || - maGradientVector.back().maStops.empty() ) - break; - parseOpacity( aValueUtf8.getStr(), - maGradientStopVector[ - maGradientVector.back().maStops.back()].maStopColor ); - break; case XML_TOKEN_INVALID: SAL_INFO("svg", "unhandled token"); break; -- cgit