diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-28 19:07:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-28 19:09:26 +0100 |
| commit | 8b2779bf61993ead742a95f3abda5d96a7a86644 (patch) | |
| tree | 1db4619afe5f8a571f94dc3172dde7dadcaee401 /starmath | |
| parent | 7eeabbca710d387e462043afdc3d8af4e28b2123 (diff) | |
Clean up C-style casts from pointers to void
Change-Id: Ia1facd79ccfa142412c833bded0d65b50e71d961
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/smmod.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/smdll.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/unomodel.cxx | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index a49d8cad0f89..7d26cd9d8425 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -140,7 +140,7 @@ public: virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; }; -#define SM_MOD() ( *(SmModule**) GetAppData(SHL_SM) ) +#define SM_MOD() ( *reinterpret_cast<SmModule**>(GetAppData(SHL_SM)) ) #endif // INCLUDED_STARMATH_INC_SMMOD_HXX diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx index f1a1bc6a7d6d..eea84b3e6080 100644 --- a/starmath/source/smdll.cxx +++ b/starmath/source/smdll.cxx @@ -51,7 +51,7 @@ namespace SmDLL::SmDLL() { - SmModule** ppShlPtr = (SmModule**) GetAppData(SHL_SM); + SmModule** ppShlPtr = reinterpret_cast<SmModule**>(GetAppData(SHL_SM)); if ( *ppShlPtr ) return; diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index c093d5f92292..1d3ce3ceb326 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -392,9 +392,9 @@ static sal_Int16 lcl_AnyToINT16(const uno::Any& rAny) sal_Int16 nRet = 0; if( eType == uno::TypeClass_DOUBLE ) - nRet = (sal_Int16)*(double*)rAny.getValue(); + nRet = (sal_Int16)*static_cast<double const *>(rAny.getValue()); else if( eType == uno::TypeClass_FLOAT ) - nRet = (sal_Int16)*(float*)rAny.getValue(); + nRet = (sal_Int16)*static_cast<float const *>(rAny.getValue()); else rAny >>= nRet; return nRet; @@ -478,7 +478,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* { if((*pValues).getValueType() != ::getBooleanCppuType()) throw IllegalArgumentException(); - bool bVal = *(sal_Bool*)(*pValues).getValue(); + bool bVal = *static_cast<sal_Bool const *>((*pValues).getValue()); vcl::Font aNewFont(aFormat.GetFont((*ppEntries)->mnMemberId)); aNewFont.SetItalic((bVal) ? ITALIC_NORMAL : ITALIC_NONE); aFormat.SetFont((*ppEntries)->mnMemberId, aNewFont); @@ -494,7 +494,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* { if((*pValues).getValueType() != ::getBooleanCppuType()) throw IllegalArgumentException(); - bool bVal = *(sal_Bool*)(*pValues).getValue(); + bool bVal = *static_cast<sal_Bool const *>((*pValues).getValue()); vcl::Font aNewFont(aFormat.GetFont((*ppEntries)->mnMemberId)); aNewFont.SetWeight((bVal) ? WEIGHT_BOLD : WEIGHT_NORMAL); aFormat.SetFont((*ppEntries)->mnMemberId, aNewFont); @@ -534,7 +534,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* case HANDLE_IS_TEXT_MODE : { - aFormat.SetTextmode(*(sal_Bool*)(*pValues).getValue()); + aFormat.SetTextmode(*static_cast<sal_Bool const *>((*pValues).getValue())); } break; @@ -592,7 +592,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* } break; case HANDLE_IS_SCALE_ALL_BRACKETS : - aFormat.SetScaleNormalBrackets(*(sal_Bool*)(*pValues).getValue()); + aFormat.SetScaleNormalBrackets(*static_cast<sal_Bool const *>((*pValues).getValue())); break; case HANDLE_PRINTER_NAME: { |