diff options
author | Mark Hung <marklh9@gmail.com> | 2018-06-17 23:05:52 +0800 |
---|---|---|
committer | Mark Hung <marklh9@gmail.com> | 2018-06-24 03:51:56 +0200 |
commit | 466e298a754615e788c1e63c2b7fae3c869e1597 (patch) | |
tree | 12f75bf199848c71278780efd34c506f503cd3cd /sd | |
parent | 3e768ce8260ed442b02c884c5a6bfac421dbcec9 (diff) |
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@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
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() ); |