summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-05-10 10:13:44 +0200
committerCaolán McNamara <caolanm@redhat.com>2014-05-15 11:46:18 +0000
commit88c9939515efe8d7ef459e7b36df99282d437a48 (patch)
tree069efa9a00ef5d14ccff3774f91d9fad26464b05 /sd
parentc0fee7f70f4c7d97cd911c987d0b6dd57c6795e5 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 0eafa0b21eeb..60c51fa8d3db 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);
}
}