[Libreoffice-commits] core.git: sd/source

[Julien Nabet]

 sd/source/ui/animations/CustomAnimationPane.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 683e0ee64ab546c1671999a1047f811584f434d3
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Apr 10 08:42:21 2016 +0200

    tdf#99155: fix crash on clicking subcategory title in customanimations
    
    Change-Id: I87b8664366c44d80a3ad1b4062ccb99bb1cdb8b9
    Reviewed-on: https://gerrit.libreoffice.org/23955
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index e5f3816..0d7b552 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1749,6 +1749,10 @@ void CustomAnimationPane::animationChange()
     if( maListSelection.size() == 1 )
     {
         CustomAnimationPresetPtr* pPreset = static_cast< CustomAnimationPresetPtr* >(mpLBAnimation->GetSelectEntryData());
+        // tdf#99137, the selected entry may also be a subcategory title, so not an effect
+        // just leave in this case
+        if (!pPreset)
+            return;
         const double fDuration = (*pPreset)->getDuration();
         CustomAnimationPresetPtr pDescriptor(*pPreset);
         MainSequenceRebuildGuard aGuard( mpMainSequence );