[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - filter/source

[Marco Cecchetti (via logerrit)]

 filter/source/svg/presentation_engine.js |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 51772544c03bc749c8b191e7134d738dd099dbaa
Author:     Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Wed Aug 26 09:06:59 2020 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Aug 27 21:14:58 2020 +0200

    filter: svg export: error when playing an animated empty text field
    
    Change-Id: I4af15c4503dbd8953c1caf2a51a09f41b94ca6f0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101379
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/filter/source/svg/presentation_engine.js 
b/filter/source/svg/presentation_engine.js
index 3484fc296c7a..b4c8d3a63078 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -9661,6 +9661,7 @@ function NodeContext( aSlideShowContext )
     this.aSourceEventElementMap = null;
     this.nStartDelay = 0.0;
     this.bFirstRun = undefined;
+    this.bIsInvalid = false;
     this.aSlideHeight = HEIGHT;
     this.aSlideWidth = WIDTH;
 }
@@ -9933,7 +9934,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' ) );
@@ -15226,7 +15227,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
@@ -15254,6 +15256,7 @@ SlideAnimations.prototype.end = function( 
bLeftEffectsSkipped )
         this.aContext.bFirstRun = false;
     }
 
+    this.aContext.bIsInvalid = false;
 };
 
 SlideAnimations.prototype.dispose = function()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits