Kaydet (Commit) 23f5c03d authored tarafından Marco Cecchetti's avatar Marco Cecchetti Kaydeden (comit) Andras Timar

svg-export: slide transition did not work - fixed

Slide transition didn't work anymore since the attribute parsing did not
take into account the smil namespace prefix.

Change-Id: I779f6408b1eac964f934019d219dc4111debe592
Reviewed-on: https://gerrit.libreoffice.org/20237Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarAndras Timar <andras.timar@collabora.com>
üst 1ed6d142
...@@ -9445,7 +9445,7 @@ function SlideTransition( aAnimationsRootElement, aSlideId ) ...@@ -9445,7 +9445,7 @@ function SlideTransition( aAnimationsRootElement, aSlideId )
if( aAnimationsRootElement ) if( aAnimationsRootElement )
{ {
if( aAnimationsRootElement.firstElementChild && if( aAnimationsRootElement.firstElementChild &&
( aAnimationsRootElement.firstElementChild.getAttribute( 'begin' ) === (this.sSlideId + '.begin') ) ) ( aAnimationsRootElement.firstElementChild.getAttributeNS( NSS['smil'], 'begin' ) === (this.sSlideId + '.begin') ) )
{ {
var aTransitionFilterElement = aAnimationsRootElement.firstElementChild.firstElementChild; var aTransitionFilterElement = aAnimationsRootElement.firstElementChild.firstElementChild;
if( aTransitionFilterElement && ( aTransitionFilterElement.localName === 'transitionFilter' ) ) if( aTransitionFilterElement && ( aTransitionFilterElement.localName === 'transitionFilter' ) )
...@@ -9583,7 +9583,7 @@ SlideTransition.prototype.parseElement = function() ...@@ -9583,7 +9583,7 @@ SlideTransition.prototype.parseElement = function()
// type attribute // type attribute
this.eTransitionType = undefined; this.eTransitionType = undefined;
var sTypeAttr = aAnimElem.getAttribute( 'type' ); var sTypeAttr = aAnimElem.getAttributeNS( NSS['smil'], 'type' );
if( sTypeAttr && aTransitionTypeInMap[ sTypeAttr ] ) if( sTypeAttr && aTransitionTypeInMap[ sTypeAttr ] )
{ {
this.eTransitionType = aTransitionTypeInMap[ sTypeAttr ]; this.eTransitionType = aTransitionTypeInMap[ sTypeAttr ];
...@@ -9595,7 +9595,7 @@ SlideTransition.prototype.parseElement = function() ...@@ -9595,7 +9595,7 @@ SlideTransition.prototype.parseElement = function()
// subtype attribute // subtype attribute
this.eTransitionSubType = undefined; this.eTransitionSubType = undefined;
var sSubTypeAttr = aAnimElem.getAttribute( 'subtype' ); var sSubTypeAttr = aAnimElem.getAttributeNS( NSS['smil'], 'subtype' );
if( sSubTypeAttr && aTransitionSubtypeInMap[ sSubTypeAttr ] ) if( sSubTypeAttr && aTransitionSubtypeInMap[ sSubTypeAttr ] )
{ {
this.eTransitionSubType = aTransitionSubtypeInMap[ sSubTypeAttr ]; this.eTransitionSubType = aTransitionSubtypeInMap[ sSubTypeAttr ];
...@@ -9608,7 +9608,7 @@ SlideTransition.prototype.parseElement = function() ...@@ -9608,7 +9608,7 @@ SlideTransition.prototype.parseElement = function()
// direction attribute // direction attribute
this.bReverseDirection = false; this.bReverseDirection = false;
var sDirectionAttr = aAnimElem.getAttribute( 'direction' ); var sDirectionAttr = aAnimElem.getAttributeNS( NSS['smil'], 'direction' );
if( sDirectionAttr == 'reverse' ) if( sDirectionAttr == 'reverse' )
this.bReverseDirection = true; this.bReverseDirection = true;
...@@ -9619,7 +9619,7 @@ SlideTransition.prototype.parseElement = function() ...@@ -9619,7 +9619,7 @@ SlideTransition.prototype.parseElement = function()
this.eTransitionSubType == FADEOVERCOLOR_TRANS_SUBTYPE || this.eTransitionSubType == FADEOVERCOLOR_TRANS_SUBTYPE ||
this.eTransitionSubType == FADETOCOLOR_TRANS_SUBTYPE ) ) this.eTransitionSubType == FADETOCOLOR_TRANS_SUBTYPE ) )
{ {
var sColorAttr = aAnimElem.getAttribute( 'fadeColor' ); var sColorAttr = aAnimElem.getAttributeNS( NSS['smil'], 'fadeColor' );
if( sColorAttr ) if( sColorAttr )
this.sFadeColor = sColorAttr; this.sFadeColor = sColorAttr;
else else
...@@ -9629,7 +9629,7 @@ SlideTransition.prototype.parseElement = function() ...@@ -9629,7 +9629,7 @@ SlideTransition.prototype.parseElement = function()
// dur attribute // dur attribute
this.aDuration = null; this.aDuration = null;
var sDurAttr = aAnimElem.getAttribute( 'dur' ); var sDurAttr = aAnimElem.getAttributeNS( NSS['smil'], 'dur' );
this.aDuration = new Duration( sDurAttr ); this.aDuration = new Duration( sDurAttr );
if( !this.aDuration.isSet() ) if( !this.aDuration.isSet() )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment