summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Cecchetti <marco.cecchetti@collabora.com>2015-11-22 21:59:54 +0100
committerAndras Timar <andras.timar@collabora.com>2015-11-29 10:54:18 +0100
commitca282c75eee5f8328813e9bdf2843678234022a3 (patch)
tree76c613f935866045331cd754a338753da00f8ea4
parent2b7dad60efbbbe0fcbfc699131cbe882b1e94680 (diff)
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/20237 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 23f5c03d964c3a069eb692c7a2b1d586c124cfd1)
-rw-r--r--filter/source/svg/presentation_engine.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js
index f6426dc149ed..50908afbd447 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -9445,7 +9445,7 @@ function SlideTransition( aAnimationsRootElement, aSlideId )
if( aAnimationsRootElement )
{
if( aAnimationsRootElement.firstElementChild &&
- ( aAnimationsRootElement.firstElementChild.getAttribute( 'begin' ) === (this.sSlideId + '.begin') ) )
+ ( aAnimationsRootElement.firstElementChild.getAttributeNS( NSS['smil'], 'begin' ) === (this.sSlideId + '.begin') ) )
{
var aTransitionFilterElement = aAnimationsRootElement.firstElementChild.firstElementChild;
if( aTransitionFilterElement && ( aTransitionFilterElement.localName === 'transitionFilter' ) )
@@ -9583,7 +9583,7 @@ SlideTransition.prototype.parseElement = function()
// type attribute
this.eTransitionType = undefined;
- var sTypeAttr = aAnimElem.getAttribute( 'type' );
+ var sTypeAttr = aAnimElem.getAttributeNS( NSS['smil'], 'type' );
if( sTypeAttr && aTransitionTypeInMap[ sTypeAttr ] )
{
this.eTransitionType = aTransitionTypeInMap[ sTypeAttr ];
@@ -9595,7 +9595,7 @@ SlideTransition.prototype.parseElement = function()
// subtype attribute
this.eTransitionSubType = undefined;
- var sSubTypeAttr = aAnimElem.getAttribute( 'subtype' );
+ var sSubTypeAttr = aAnimElem.getAttributeNS( NSS['smil'], 'subtype' );
if( sSubTypeAttr && aTransitionSubtypeInMap[ sSubTypeAttr ] )
{
this.eTransitionSubType = aTransitionSubtypeInMap[ sSubTypeAttr ];
@@ -9608,7 +9608,7 @@ SlideTransition.prototype.parseElement = function()
// direction attribute
this.bReverseDirection = false;
- var sDirectionAttr = aAnimElem.getAttribute( 'direction' );
+ var sDirectionAttr = aAnimElem.getAttributeNS( NSS['smil'], 'direction' );
if( sDirectionAttr == 'reverse' )
this.bReverseDirection = true;
@@ -9619,7 +9619,7 @@ SlideTransition.prototype.parseElement = function()
this.eTransitionSubType == FADEOVERCOLOR_TRANS_SUBTYPE ||
this.eTransitionSubType == FADETOCOLOR_TRANS_SUBTYPE ) )
{
- var sColorAttr = aAnimElem.getAttribute( 'fadeColor' );
+ var sColorAttr = aAnimElem.getAttributeNS( NSS['smil'], 'fadeColor' );
if( sColorAttr )
this.sFadeColor = sColorAttr;
else
@@ -9629,7 +9629,7 @@ SlideTransition.prototype.parseElement = function()
// dur attribute
this.aDuration = null;
- var sDurAttr = aAnimElem.getAttribute( 'dur' );
+ var sDurAttr = aAnimElem.getAttributeNS( NSS['smil'], 'dur' );
this.aDuration = new Duration( sDurAttr );
if( !this.aDuration.isSet() )
{