diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 13:12:20 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 13:12:20 +0200 |
commit | b57f8a945117a8e32d36549a24c87377c54a798e (patch) | |
tree | dc621f5f2087e663c0be67ccbe6aee2b88c21943 /chart2 | |
parent | 26655d0909e649f7d7ceb5e5cbb9a26fdc6753b6 (diff) |
Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: I97e238df6fc71367b4a17a5da48ed527c5b57666
Diffstat (limited to 'chart2')
4 files changed, 7 insertions, 7 deletions
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index bdbff59a74c3..0c2efa7fb1ad 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -288,7 +288,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI { OSL_ASSERT( rSubIncrements[0].IntervalCount.getValueTypeClass() == uno::TypeClass_LONG ); rOutItemSet.Put( SfxInt32Item( nWhichId, - *reinterpret_cast< const sal_Int32 * >( + *static_cast< const sal_Int32 * >( rSubIncrements[0].IntervalCount.getValue()) )); } else diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index dd1fd87df986..fae05e753885 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -153,7 +153,7 @@ void CharacterPropertyItemConverter::FillSpecialItem( aValue = GetPropertySet()->getPropertyValue( "CharUnderlineHasColor" ); if( aValue.hasValue() && - ( *reinterpret_cast< const sal_Bool * >( aValue.getValue()) != sal_False )) + ( *static_cast< const sal_Bool * >( aValue.getValue()) != sal_False )) { aItem.PutValue( aValue, MID_TL_HASCOLOR ); bModified = true; @@ -185,7 +185,7 @@ void CharacterPropertyItemConverter::FillSpecialItem( aValue = GetPropertySet()->getPropertyValue( "CharOverlineHasColor" ); if ( aValue.hasValue() && - ( *reinterpret_cast< const sal_Bool* >( aValue.getValue() ) != sal_False ) ) + ( *static_cast< const sal_Bool* >( aValue.getValue() ) != sal_False ) ) { aItem.PutValue( aValue, MID_TL_HASCOLOR ); bModified = true; diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index d5584d78ad84..464345ec4003 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -109,7 +109,7 @@ bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObj { case CHARTTRANSFER_OBJECTTYPE_DRAWMODEL: { - SdrModel* pMarkedObjModel = reinterpret_cast< SdrModel* >( pUserObject ); + SdrModel* pMarkedObjModel = static_cast< SdrModel* >( pUserObject ); if ( pMarkedObjModel ) { rxOStm->SetBufferSize( 0xff00 ); diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx index eb94b1dbbf04..c7bcff16c897 100644 --- a/chart2/source/inc/CommonFunctors.hxx +++ b/chart2/source/inc/CommonFunctors.hxx @@ -62,7 +62,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::co ::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() ); if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE ) { - fResult = * reinterpret_cast< const double * >( rAny.getValue() ); + fResult = * static_cast< const double * >( rAny.getValue() ); } return fResult; @@ -79,7 +79,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::co ::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() ); if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE ) { - const double* pDouble = reinterpret_cast< const double * >( rAny.getValue() ); + const double* pDouble = static_cast< const double * >( rAny.getValue() ); if( ::rtl::math::isNan(*pDouble) ) return OUString(); return ::rtl::math::doubleToUString( @@ -92,7 +92,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::co } else if( eClass == ::com::sun::star::uno::TypeClass_STRING ) { - return * reinterpret_cast< const OUString * >( rAny.getValue() ); + return * static_cast< const OUString * >( rAny.getValue() ); } return OUString(); |