[Libreoffice-commits] core.git: sd/source
Mark Hung
marklh9 at gmail.com
Sun Jun 24 01:52:18 UTC 2018
sd/source/ui/animations/CustomAnimationPane.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 466e298a754615e788c1e63c2b7fae3c869e1597
Author: Mark Hung <marklh9 at gmail.com>
Date: Sun Jun 17 23:05:52 2018 +0800
sd effects: keep configurations that is not changed.
Change-Id: Ia2c670c708caaf8ab50a13e0635c13a759fd5941
Reviewed-on: https://gerrit.libreoffice.org/55974
Tested-by: Jenkins
Reviewed-by: Mark Hung <marklh9 at gmail.com>
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 4f57fe860884..497868945385 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1501,15 +1501,23 @@ void CustomAnimationPane::changeSelection( STLPropertySet const * pResultSet, ST
if( bHasTextGrouping )
pResultSet->getPropertyValue(nHandleTextGrouping) >>= nTextGrouping;
+ else
+ pOldSet->getPropertyValue(nHandleTextGrouping) >>= nTextGrouping;
if( bHasAnimateForm )
pResultSet->getPropertyValue(nHandleAnimateForm) >>= bAnimateForm;
+ else
+ pOldSet->getPropertyValue(nHandleAnimateForm) >>= bAnimateForm;
if( bHasTextGroupingAuto )
pResultSet->getPropertyValue(nHandleTextGroupingAuto) >>= fTextGroupingAuto;
+ else
+ pOldSet->getPropertyValue(nHandleTextGroupingAuto) >>= fTextGroupingAuto;
if( bHasTextReverse )
pResultSet->getPropertyValue(nHandleTextReverse) >>= bTextReverse;
+ else
+ pOldSet->getPropertyValue(nHandleTextReverse) >>= bTextReverse;
EffectSequence const aSelectedEffects( maListSelection );
EffectSequence::const_iterator iter( aSelectedEffects.begin() );
More information about the Libreoffice-commits
mailing list