summaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorMarco Cecchetti <marco.cecchetti@collabora.com>2020-08-26 09:06:59 +0200
committerAndras Timar <andras.timar@collabora.com>2020-08-28 07:03:59 +0200
commit554834484a3323f73b5aeace246bcd9635368967 (patch)
treecf36f974244ca2dfd9e9347201fc44b49a61edfc /filter
parentUse ToolBarMerger::IsCorrectContext (diff)
downloadcore-554834484a3323f73b5aeace246bcd9635368967.tar.gz
core-554834484a3323f73b5aeace246bcd9635368967.zip
filter: svg export: error when playing an animated empty text field
Change-Id: I4af15c4503dbd8953c1caf2a51a09f41b94ca6f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101359 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/svg/presentation_engine.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js
index 5e67ecd2ea7e..cc67d3252a96 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -9647,6 +9647,7 @@ function NodeContext( aSlideShowContext )
this.aSourceEventElementMap = null;
this.nStartDelay = 0.0;
this.bFirstRun = undefined;
+ this.bIsInvalid = false;
this.aSlideHeight = HEIGHT;
this.aSlideWidth = WIDTH;
}
@@ -9919,7 +9920,7 @@ BaseNode.prototype.init = function()
BaseNode.prototype.resolve = function()
{
- if( ! this.checkValidNode() )
+ if( this.aNodeContext.bIsInvalid || ! this.checkValidNode() )
return false;
this.DBG( this.callInfo( 'resolve' ) );
@@ -15212,7 +15213,8 @@ SlideAnimations.prototype.start = function()
this.aContext.bFirstRun = false;
// init all nodes
- if( !this.aRootNode.init() )
+ this.aContext.bIsInvalid = !this.aRootNode.init();
+ if( this.aContext.bIsInvalid )
return false;
// resolve root node
@@ -15240,6 +15242,7 @@ SlideAnimations.prototype.end = function( bLeftEffectsSkipped )
this.aContext.bFirstRun = false;
}
+ this.aContext.bIsInvalid = false;
};
SlideAnimations.prototype.dispose = function()