[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source

[David Tardon]

 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 88c9939515efe8d7ef459e7b36df99282d437a48
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 10 10:13:44 2014 +0200

    Related: rhbz#1071604 don't paint anim. effect icon
    
    ... unless the slide does have custom animations. This drops dep of Draw
    on libanimcore, which is in module impress, so it might not be present.
    If it is not present, the Pages panel is not drawn.
    
    Change-Id: I9d7377a4fb3289e230887752bc4a105ca1c9f812
    (cherry picked from commit 90af0348216a5a3c2eecd660e012500d2917b279)
    Reviewed-on: https://gerrit.libreoffice.org/9300
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 0eafa0b..60c51fa 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -94,7 +94,8 @@ void PageObjectPainter::PaintPageObject (
         PaintPreview(rDevice, rpDescriptor);
         PaintPageNumber(rDevice, rpDescriptor);
         PaintTransitionEffect(rDevice, rpDescriptor);
-        PaintCustomAnimationEffect(rDevice, rpDescriptor);
+        if (rpDescriptor->GetPage()->hasAnimationNode())
+            PaintCustomAnimationEffect(rDevice, rpDescriptor);
         rDevice.SetAntialiasing(nSavedAntialiasingMode);
     }
 }