summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-31 13:17:54 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-03-31 13:17:54 +0200
commitc0755c8ee064bc1b4868de560232b3d604b2156b (patch)
treef298220c856114db22229cd0f301617e5f76b745
parent7b5924ff983ba992329c76fce6ebaf9cdab3a064 (diff)
Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: Ie25a2b8a84a146a5b988c6ef77127896d126e488
-rw-r--r--xmloff/source/core/facreg.cxx2
-rw-r--r--xmloff/source/style/impastpl.cxx26
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.cxx2
3 files changed, 15 insertions, 15 deletions
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 60f2bee370a3..2f2eb2bcfe7e 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -53,7 +53,7 @@ XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory( const sal_Char * pImpl
void * pRet = 0;
if( pServiceManager )
{
- uno::Reference< lang::XMultiServiceFactory > xMSF( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
+ uno::Reference< lang::XMultiServiceFactory > xMSF( static_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory;
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index a35f51b0b4cf..83d42ca7efec 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -106,41 +106,41 @@ data2string(void *data,
case typelib_TypeClass_VOID:
break;
case typelib_TypeClass_BOOLEAN:
- result.append((*reinterpret_cast<const sal_Bool*>(data) == sal_False ) ? OUString("false") : OUString("true"));
+ result.append((*static_cast<const sal_Bool*>(data) == sal_False ) ? OUString("false") : OUString("true"));
break;
case typelib_TypeClass_BYTE:
- result.append(OUString::number((*reinterpret_cast<const sal_Int8*>(data))));
+ result.append(OUString::number((*static_cast<const sal_Int8*>(data))));
break;
case typelib_TypeClass_SHORT:
- result.append(OUString::number((*reinterpret_cast<const sal_Int16*>(data))));
+ result.append(OUString::number((*static_cast<const sal_Int16*>(data))));
break;
case typelib_TypeClass_LONG:
- result.append(OUString::number((*reinterpret_cast<const sal_Int32*>(data))));
+ result.append(OUString::number((*static_cast<const sal_Int32*>(data))));
break;
case typelib_TypeClass_HYPER:
- result.append(OUString::number((*reinterpret_cast<const sal_Int64*>(data))));
+ result.append(OUString::number((*static_cast<const sal_Int64*>(data))));
break;
case typelib_TypeClass_UNSIGNED_SHORT:
- result.append(OUString::number((*reinterpret_cast<const sal_uInt16*>(data))));
+ result.append(OUString::number((*static_cast<const sal_uInt16*>(data))));
break;
case typelib_TypeClass_UNSIGNED_LONG:
- result.append(OUString::number((*reinterpret_cast<const sal_uInt32*>(data)), 16));
+ result.append(OUString::number((*static_cast<const sal_uInt32*>(data)), 16));
break;
case typelib_TypeClass_UNSIGNED_HYPER:
- result.append(OUString::number((*reinterpret_cast<const sal_uInt64*>(data)), 16));
+ result.append(OUString::number((*static_cast<const sal_uInt64*>(data)), 16));
break;
case typelib_TypeClass_FLOAT:
- result.append(OUString::number((*reinterpret_cast<const float*>(data))));
+ result.append(OUString::number((*static_cast<const float*>(data))));
break;
case typelib_TypeClass_DOUBLE:
- result.append(OUString::number((*reinterpret_cast<const double*>(data))));
+ result.append(OUString::number((*static_cast<const double*>(data))));
break;
case typelib_TypeClass_CHAR:
result.append("U+");
- result.append(OUString::number((*reinterpret_cast<const sal_uInt16*>(data))));
+ result.append(OUString::number((*static_cast<const sal_uInt16*>(data))));
break;
case typelib_TypeClass_STRING:
- result.append(*reinterpret_cast<OUString*>(data));
+ result.append(*static_cast<OUString*>(data));
break;
case typelib_TypeClass_TYPE:
case typelib_TypeClass_SEQUENCE:
@@ -152,7 +152,7 @@ data2string(void *data,
result.append(struct2string(data, type->pType));
break;
case typelib_TypeClass_ENUM:
- result.append(OUString::number((*reinterpret_cast<const sal_Int32*>(data))));
+ result.append(OUString::number((*static_cast<const sal_Int32*>(data))));
break;
default:
assert(false); // this cannot happen I hope
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 1d273ecd2234..c834c2e1b731 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -95,7 +95,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xof_component_getFactory( const sal_Char * p
{
try
{
- uno::Reference< lang::XMultiServiceFactory > xMSF( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
+ uno::Reference< lang::XMultiServiceFactory > xMSF( static_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
const sal_Int32 nImplNameLen = strlen( pImplName );