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

bccu#1900 - additive and calc mode were not parsed correctly

Browse Source 
Change-Id: I00c4af6a6c992fc41c4b993621cded59800b5e06
Reviewed-on: https://gerrit.libreoffice.org/26836
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
This commit is contained in:
Marco Cecchetti
2016-06-21 13:13:06 +02:00
committed by Marco Cecchetti
parent 14272dde34
commit a3dae1ec55
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
filter/source/svg/presentation_engine.js
View File

@@ -4000,11 +4000,12 @@ aFillModeOutMap = [ 'inherit', 'remove', 'freeze', 'hold', 'transition', 'auto'
// Additive Modes // Additive Modes
var ADDITIVE_MODE_BASE = 0; var ADDITIVE_MODE_UNKNOWN = 0;
var ADDITIVE_MODE_SUM = 1; var ADDITIVE_MODE_BASE = 1;
var ADDITIVE_MODE_REPLACE = 2; var ADDITIVE_MODE_SUM = 2;
var ADDITIVE_MODE_MULTIPLY = 3; var ADDITIVE_MODE_REPLACE = 3;
var ADDITIVE_MODE_NONE = 4; var ADDITIVE_MODE_MULTIPLY = 4;
var ADDITIVE_MODE_NONE = 5;
aAddittiveModeInMap = { aAddittiveModeInMap = {
'base' : ADDITIVE_MODE_BASE, 'base' : ADDITIVE_MODE_BASE,
@@ -4014,7 +4015,7 @@ aAddittiveModeInMap = {
'none' : ADDITIVE_MODE_NONE 'none' : ADDITIVE_MODE_NONE
}; };
aAddittiveModeOutMap = [ 'base', 'sum', 'replace', 'multiply', 'none' ]; aAddittiveModeOutMap = [ 'unknown', 'base', 'sum', 'replace', 'multiply', 'none' ];
// Accumulate Modes // Accumulate Modes
@@ -4024,10 +4025,11 @@ var ACCUMULATE_MODE_SUM = 1;
aAccumulateModeOutMap = [ 'none', 'sum' ]; aAccumulateModeOutMap = [ 'none', 'sum' ];
// Calculation Modes // Calculation Modes
var CALC_MODE_DISCRETE = 0; var CALC_MODE_UNKNOWN = 0
var CALC_MODE_LINEAR = 1; var CALC_MODE_DISCRETE = 1;
var CALC_MODE_PACED = 2; var CALC_MODE_LINEAR = 2;
var CALC_MODE_SPLINE = 3; var CALC_MODE_PACED = 3;
var CALC_MODE_SPLINE = 4;
aCalcModeInMap = { aCalcModeInMap = {
'discrete' : CALC_MODE_DISCRETE, 'discrete' : CALC_MODE_DISCRETE,
@@ -4036,7 +4038,7 @@ aCalcModeInMap = {
'spline' : CALC_MODE_SPLINE 'spline' : CALC_MODE_SPLINE
}; };
aCalcModeOutMap = [ 'discrete', 'linear', 'paced', 'spline' ]; aCalcModeOutMap = [ 'unknown', 'discrete', 'linear', 'paced', 'spline' ];
// Color Spaces // Color Spaces
@@ -12101,7 +12103,7 @@ function createValueListActivity( aActivityParamSet, aAnimationNode, aAnimation,
{ {
var aAnimatedElement = aAnimationNode.getAnimatedElement(); var aAnimatedElement = aAnimationNode.getAnimatedElement();
var aOperatorSet = aOperatorSetMap[ eValueType ]; var aOperatorSet = aOperatorSetMap[ eValueType ];
assert( aOperatorSet, 'createFromToByActivity: no operator set found' ); assert( aOperatorSet, 'createValueListActivity: no operator set found' );
var aValueSet = aAnimationNode.getValues(); var aValueSet = aAnimationNode.getValues();