sd/source/core/CustomAnimationEffect.cxx | 10 ++++++++++
1 file changed, 10 insertions(+)
New commits:
commit 5c5cced0fcdac73031e5c75ba8e5593be594890c
Author: Mark Hung <mark...@gmail.com>
Date: Mon Jun 18 14:27:31 2018 +0800
tdf#47795 set mnTextGrouping to last non WITH_PREVIOUS level.
Change-Id: I8ca3b421dbfa83c19234f5cbde0a2ae340d3d268
Reviewed-on: https://gerrit.libreoffice.org/55979
Tested-by: Jenkins
Reviewed-by: Mark Hung <mark...@gmail.com>
diff --git a/sd/source/core/CustomAnimationEffect.cxx
b/sd/source/core/CustomAnimationEffect.cxx
index bba621dbab1e..c9e8cb2497e9 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2318,6 +2318,16 @@ void EffectSequenceHelper::updateTextGroups()
pGroup->addEffect( pEffect );
}
+
+ // Now that all the text groups have been cleared up and rebuilt, we need
to update its
+ // text grouping. addEffect() already make mnTextGrouping the last
possible level,
+ // so just continue to find the last level that is not
EffectNodeType::WITH_PREVIOUS.
+ for(const auto &rGroupMapItem: maGroupMap)
+ {
+ const CustomAnimationTextGroupPtr &pGroup = rGroupMapItem.second;
+ while(pGroup->mnTextGrouping > 0 &&
pGroup->mnDepthFlags[pGroup->mnTextGrouping - 1] ==
EffectNodeType::WITH_PREVIOUS)
+ --pGroup->mnTextGrouping;
+ }
}
CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup(
CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double
fTextGroupingAuto, bool bAnimateForm, bool bTextReverse )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
