diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-08 17:45:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-08 17:45:08 +0200 |
| commit | 9222f5d065bb2aafcfef93e77c58a82672a9ad22 (patch) | |
| tree | 0dfad9f13099a73ecf3893e9cbdd5020b55cd7b3 /sd | |
| parent | c4dca26eafd60dc4c4f19e0be0b8e086108b3048 (diff) | |
A UNO Any can't contain an Any
...and css::uno::makeAny<css::uno::Any>() was never meant to be used. Introduce
css::uno::toAny for the (template-code) cases that shall return an Any for both
Any and non-Any inputs.
Change-Id: Ifa977d73f1da71b2fedde7e8140b19497c4a0257
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 97f9559bf5c6..7ad5e3f30c03 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1370,12 +1370,12 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) if ( mpCLBDimColor->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) aSelectedColor = mpCLBDimColor->GetSelectEntryColor(); - aDimColor = makeAny( makeAny( (sal_Int32)aSelectedColor.GetRGBColor() ) ); + aDimColor = makeAny( (sal_Int32)aSelectedColor.GetRGBColor() ); } if( (mpSet->getPropertyState( nHandleDimColor ) == STLPropertyState_AMBIGUOUS) || (mpSet->getPropertyValue( nHandleDimColor ) != aDimColor) ) - pSet->setPropertyValue( nHandleDimColor, makeAny( aDimColor ) ); + pSet->setPropertyValue( nHandleDimColor, aDimColor ); bool bAfterEffectOnNextEffect = nPos != 2 ? sal_True : sal_False; bool bOldAfterEffectOnNextEffect = !bAfterEffectOnNextEffect; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index b7087f969963..f327dc95bfc5 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1068,7 +1068,7 @@ STLPropertySet* CustomAnimationPane::createSelectionSet() addValue( pSet, nHandleBegin, makeAny( pEffect->getBegin() ) ); addValue( pSet, nHandleDuration, makeAny( pEffect->getDuration() ) ); addValue( pSet, nHandleStart, makeAny( pEffect->getNodeType() ) ); - addValue( pSet, nHandleRepeat, makeAny( pEffect->getRepeatCount() ) ); + addValue( pSet, nHandleRepeat, pEffect->getRepeatCount() ); addValue( pSet, nHandleEnd, pEffect->getEnd() ); addValue( pSet, nHandleRewind, makeAny( pEffect->getFill() ) ); |