diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-06 23:25:13 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-06 23:25:42 +0200 |
commit | 21010f3ea76a98ba8349b7ab3ffd7dcadd6a2d1c (patch) | |
tree | 64e7158943ed6f77e828f0ec5cd11c083496f883 /sd | |
parent | 127a5f5e12d33203f871ee810e4b7ef557b7764b (diff) |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part4
Change-Id: I8e52c2fd66f8f3291434ee82a745431e11b12caf
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/CustomAnimationCloner.cxx | 8 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptinanimations.cxx | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index f4971f675008..6bd23086871a 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -223,7 +223,7 @@ namespace sd { if( rValue.hasValue() ) try { - if( rValue.getValueType() == ::getCppuType((const ValuePair*)0) ) + if( rValue.getValueType() == cppu::UnoType<ValuePair>::get() ) { ValuePair aValuePair; rValue >>= aValuePair; @@ -233,7 +233,7 @@ namespace sd return makeAny( aValuePair ); } - else if( rValue.getValueType() == ::getCppuType((Sequence<Any>*)0) ) + else if( rValue.getValueType() == cppu::UnoType< Sequence<Any> >::get() ) { Sequence<Any> aSequence; rValue >>= aSequence; @@ -263,7 +263,7 @@ namespace sd return makeAny( getClonedNode( xNode ) ); } } - else if( rValue.getValueType() == ::getCppuType((const ParagraphTarget*)0) ) + else if( rValue.getValueType() == cppu::UnoType<ParagraphTarget>::get() ) { ParagraphTarget aParaTarget; rValue >>= aParaTarget; @@ -272,7 +272,7 @@ namespace sd return makeAny( aParaTarget ); } - else if( rValue.getValueType() == ::getCppuType((const Event*)0) ) + else if( rValue.getValueType() == cppu::UnoType<Event>::get() ) { Event aEvent; rValue >>= aEvent; diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 3f1e1418ebc0..be60d6502bae 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -839,7 +839,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any { OUString aString; - if( rValue.getValueType() == ::getCppuType((const ValuePair*)0) ) + if( rValue.getValueType() == cppu::UnoType<ValuePair>::get() ) { ValuePair aValuePair; if( rValue >>= aValuePair ) @@ -863,7 +863,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any } } } - else if( rValue.getValueType() == ::getCppuType((const OUString*)0) ) + else if( rValue.getValueType() == cppu::UnoType<OUString>::get() ) { if( rValue >>= aString ) { @@ -890,14 +890,14 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any case MS_STYLEROTATION: { - if( rValue.getValueType() == ::getCppuType((const OUString*)0) ) + if( rValue.getValueType() == cppu::UnoType<OUString>::get() ) { OUString aString; rValue >>= aString; rValue <<= (sal_Int16)aString.toDouble(); bRet = true; } - else if( rValue.getValueType() == ::getCppuType((const double*)0) ) + else if( rValue.getValueType() == cppu::UnoType<double>::get() ) { double fValue = 0.0; rValue >>= fValue; @@ -2683,7 +2683,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen bool bHasValue = aValue2.hasValue(); if( bHasValue ) { - if( aValue2.getValueType() == ::getCppuType((const OUString*)0) ) + if( aValue2.getValueType() == cppu::UnoType<OUString>::get() ) { OUString aTest; aValue2 >>= aTest; @@ -2692,7 +2692,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen } } - if( bHasValue && bCouldBeFormula && (aValue1.getValueType() == ::getCppuType((const double*)0)) ) + if( bHasValue && bCouldBeFormula && (aValue1.getValueType() == cppu::UnoType<double>::get() )) { aValue2 >>= aFormula; bHasValue = false; |