[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source

[Henry Castro]

 svx/source/sdr/animation/animationstate.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit f5207835163e9e116dc8459a7ed37a7736d5e818
Author: Henry Castro <hcastro at collabora.com>
Date:   Sun Jun 14 15:00:23 2015 -0400

    sdr tiled rendering: stop animation timer's task
    
    Change-Id: Ia7281c853454e283150bba3c79aa9579363c7ca3
    Signed-off-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx
index 58e2ac3..bc7b573 100644
--- a/svx/source/sdr/animation/animationstate.cxx
+++ b/svx/source/sdr/animation/animationstate.cxx
@@ -24,6 +24,7 @@
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <drawinglayer/primitive2d/animatedprimitive2d.hxx>
 #include <drawinglayer/animation/animationtiming.hxx>
+#include <comphelper/lok.hxx>
 
 
 
@@ -111,8 +112,9 @@ namespace sdr
             mrVOContact(rVOContact),
             maAnimatedPrimitives(rAnimatedPrimitives)
         {
-            // setup initially
-            prepareNextEvent();
+            if (!comphelper::LibreOfficeKit::isActive())
+                // setup initially
+                prepareNextEvent();
         }
 
         PrimitiveAnimation::~PrimitiveAnimation()
@@ -127,8 +129,9 @@ namespace sdr
             // schedule a repaint of associated object
             mrVOContact.ActionChanged();
 
-            // re-setup
-            prepareNextEvent();
+            if (!comphelper::LibreOfficeKit::isActive())
+                // re-setup
+                prepareNextEvent();
         }
     } // end of namespace animation
 } // end of namespace sdr