diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2016-04-10 08:42:21 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2016-04-10 07:13:53 +0000 |
commit | 683e0ee64ab546c1671999a1047f811584f434d3 (patch) | |
tree | ba0826331e21cb894b3d21800a4e1f936153713e /sd | |
parent | 79fc3337851994acf813dacd2a518ba408d37581 (diff) |
tdf#99155: fix crash on clicking subcategory title in customanimations
Change-Id: I87b8664366c44d80a3ad1b4062ccb99bb1cdb8b9
Reviewed-on: https://gerrit.libreoffice.org/23955
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index e5f3816d2373..0d7b55259fbb 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 ); |