mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce to static_cast any reinterpret_cast from void pointers

Browse Source 
Change-Id: I0392b2fc9e48aab4a20849d8203cae96b1ef2d2c
This commit is contained in:
Stephan Bergmann
2015-03-31 13:13:09 +02:00
parent c57ffac695
commit caaf1436d7
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cppuhelper/source/exc_thrower.cxx
View File

@@ -86,7 +86,7 @@ static void SAL_CALL ExceptionThrower_dispatch(
case 0: // queryInterace()
{
Type const & rType_demanded =
*reinterpret_cast< Type const * >( pArgs[ 0 ] );
*static_cast< Type const * >( pArgs[ 0 ] );
if (rType_demanded.equals(
::getCppuType( reinterpret_cast<
Reference< XInterface > const * >(0) ) ) ||
@@ -95,13 +95,13 @@ static void SAL_CALL ExceptionThrower_dispatch(
typelib_TypeDescription * pTD = 0;
TYPELIB_DANGER_GET( &pTD, rType_demanded.getTypeLibType() );
uno_any_construct(
reinterpret_cast< uno_Any * >( pReturn ), &pUnoI, pTD, 0 );
static_cast< uno_Any * >( pReturn ), &pUnoI, pTD, 0 );
TYPELIB_DANGER_RELEASE( pTD );
}
else
{
uno_any_construct(
reinterpret_cast< uno_Any * >( pReturn ), 0, 0, 0 );
static_cast< uno_Any * >( pReturn ), 0, 0, 0 );
}
*ppException = 0;
break;
@@ -112,7 +112,7 @@ static void SAL_CALL ExceptionThrower_dispatch(
break;
case 3: // throwException()
{
uno_Any * pAny = reinterpret_cast< uno_Any * >( pArgs[ 0 ] );
uno_Any * pAny = static_cast< uno_Any * >( pArgs[ 0 ] );
OSL_ASSERT( pAny->pType->eTypeClass == typelib_TypeClass_EXCEPTION );
uno_type_any_construct( *ppException, pAny->pData, pAny->pType, 0 );
break;

2
cppuhelper/source/implementationentry.cxx
View File

@@ -42,7 +42,7 @@ sal_Bool component_writeInfoHelper(
{
OUString sKey = "/" + entries[i].getImplementationName() + "/UNO/SERVICES";
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( sKey ) );
static_cast< XRegistryKey * >( pRegistryKey )->createKey( sKey ) );
Sequence< OUString > seq = entries[i].getSupportedServiceNames();
const OUString *pArray = seq.getConstArray();

2
cppuhelper/source/macro_expander.cxx
View File

@@ -202,7 +202,7 @@ Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_facto
uno::Mapping target2curr(target_env, curr_env);
return Reference<lang::XSingleComponentFactory>(
reinterpret_cast<lang::XSingleComponentFactory *>(
static_cast<lang::XSingleComponentFactory *>(
target2curr.mapInterface(free.get(), ::getCppuType(&free))),
SAL_NO_ACQUIRE);
}

4
cppuhelper/source/tdmgr.cxx
View File

@@ -579,7 +579,7 @@ static void SAL_CALL typelib_callback(
if (pContext && pTypeName)
{
Reference< container::XHierarchicalNameAccess > access(
reinterpret_cast< container::XHierarchicalNameAccess * >(
static_cast< container::XHierarchicalNameAccess * >(
pContext));
try
{
@@ -649,7 +649,7 @@ sal_Bool SAL_CALL installTypeDescriptionManager(
Reference<container::XHierarchicalNameAccess> xTDMgr(
reinterpret_cast<container::XHierarchicalNameAccess *>(
static_cast<container::XHierarchicalNameAccess *>(
curr2target.mapInterface(xTDMgr_c.get(), ::getCppuType(&xTDMgr_c))),
SAL_NO_ACQUIRE);