mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#95510: SVG: Import stop-color and stop-opacity

Browse Source 
Change-Id: Ie073ff3e92c9344a78badfeefa0afed2c2b76fb8
Reviewed-on: https://gerrit.libreoffice.org/19731
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
This commit is contained in:
Xisco Fauli
2015-11-02 00:46:29 +01:00
committed by Katarina Behrens
parent 609b227873
commit c89ba1dedc
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
filter/source/svg/svgreader.cxx
View File

@@ -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;

6
include/xmloff/xmltoken.hxx
View File

@@ -1117,6 +1117,7 @@ namespace xmloff { namespace token {
XML_LINE_SPACING,
XML_LINE_STYLE,
XML_LINEAR,
XML_LINEARGRADIENT,
XML_LINENUMBERING_CONFIGURATION,
XML_LINENUMBERING_SEPARATOR,
XML_LINES,
@@ -1740,8 +1741,8 @@ namespace xmloff { namespace token {
XML_STOCK_UPDOWN_BARS,
XML_STOCK_WITH_VOLUME,
XML_STOP,
XML_STOPCOLOR,
XML_STOPOPACITY,
XML_STOP_COLOR,
XML_STOP_OPACITY,
XML_STRETCH,
XML_STRETCH_FROM_BOTTOM,
XML_STRETCH_FROM_LEFT,
@@ -1776,7 +1777,6 @@ namespace xmloff { namespace token {
XML_SUB_VIEW_SIZE,
XML_SUFFIX,
XML_SUM,
XML_SVGLINEARGRADIENT,
XML_SWISS,
XML_SYMBOL,
XML_SYMBOL_HEIGHT,

6
xmloff/source/core/xmltoken.cxx
View File

@@ -1122,6 +1122,7 @@ namespace xmloff { namespace token {
TOKEN( "line-spacing", XML_LINE_SPACING ),
TOKEN( "line-style", XML_LINE_STYLE ),
TOKEN( "linear", XML_LINEAR ),
TOKEN( "linearGradient", XML_LINEARGRADIENT ),
TOKEN( "linenumbering-configuration", XML_LINENUMBERING_CONFIGURATION ),
TOKEN( "linenumbering-separator", XML_LINENUMBERING_SEPARATOR ),
TOKEN( "lines", XML_LINES ),
@@ -1745,8 +1746,8 @@ namespace xmloff { namespace token {
TOKEN( "stock-updown-bars", XML_STOCK_UPDOWN_BARS ),
TOKEN( "stock-with-volume", XML_STOCK_WITH_VOLUME ),
TOKEN( "stop", XML_STOP ),
TOKEN( "stop-color", XML_STOPCOLOR ),
TOKEN( "stop-opacity", XML_STOPOPACITY ),
TOKEN( "stop-color", XML_STOP_COLOR ),
TOKEN( "stop-opacity", XML_STOP_OPACITY ),
TOKEN( "stretch", XML_STRETCH ),
TOKEN( "stretch-from-bottom", XML_STRETCH_FROM_BOTTOM ),
TOKEN( "stretch-from-left", XML_STRETCH_FROM_LEFT ),
@@ -1781,7 +1782,6 @@ namespace xmloff { namespace token {
TOKEN( "sub-view-size", XML_SUB_VIEW_SIZE ),
TOKEN( "suffix", XML_SUFFIX ),
TOKEN( "sum", XML_SUM ),
TOKEN( "linearGradient", XML_SVGLINEARGRADIENT ),
TOKEN( "swiss", XML_SWISS ),
TOKEN( "symbol", XML_SYMBOL ),
TOKEN( "symbol-height", XML_SYMBOL_HEIGHT ),