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

Andras Timar andras.timar at collabora.com
Fri May 20 20:29:23 UTC 2016


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

New commits:
commit d175fa3ab84e9f176f29861cdd1736568345a564
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 20 22:28:55 2016 +0200

    bccu#1800 fix bogus loops in slide animations and transitions
    
    Change-Id: Ia0ba0921c3ebfbfbd66fddf81e43fec480f6d5bb

diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js
index ea5774a..c9222f5 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -13381,7 +13381,7 @@ function ElapsedTime( aTimeBase )
 {
     this.aTimeBase = aTimeBase;
     this.nLastQueriedTime = 0.0;
-    this.nStartTime = this.getSystemTime();
+    this.nStartTime = this.getCurrentTime();
     this.nFrozenTime = 0.0;
     this.bInPauseMode = false;
     this.bInHoldMode = false;
@@ -13396,7 +13396,7 @@ ElapsedTime.prototype.getTimeBase = function()
 ElapsedTime.prototype.reset = function()
 {
     this.nLastQueriedTime = 0.0;
-    this.nStartTime = this.getSystemTime();
+    this.nStartTime = this.getCurrentTime();
     this.nFrozenTime = 0.0;
     this.bInPauseMode = false;
     this.bInHoldMode = false;


More information about the Libreoffice-commits mailing list