From 88d7938ade37c9b7c4fccb0678ce38403d023764 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 28 Mar 2015 19:04:47 +0100 Subject: Clean up C-style casts from pointers to void Change-Id: Ieb830d8216badd75899666f4db565a83e37d11fc --- javaunohelper/source/bootstrap.cxx | 4 ++-- javaunohelper/source/javaunohelper.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index 22dd83e196be..537dfbb03710 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -52,7 +52,7 @@ inline OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env ) OSL_ASSERT( sizeof (sal_Unicode) == sizeof (jchar) ); jsize len = jni_env->GetStringLength( jstr ); rtl_uString * ustr = - (rtl_uString *)rtl_allocateMemory( sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) ); + static_cast(rtl_allocateMemory( sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) )); jni_env->GetStringRegion( jstr, 0, len, ustr->buffer ); OSL_ASSERT( JNI_FALSE == jni_env->ExceptionCheck() ); ustr->refCount = 1; @@ -139,7 +139,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( throw RuntimeException("cannot get mapping C++ <-> Java!" ); } - jobject jret = (jobject)mapping.mapInterface( xContext.get(), ::getCppuType( &xContext ) ); + jobject jret = static_cast(mapping.mapInterface( xContext.get(), ::getCppuType( &xContext ) )); jobject jlocal = jni_env->NewLocalRef( jret ); jni_env->DeleteGlobalRef( jret ); diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index 71914272646f..52ec161230f8 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -221,8 +221,8 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( if (pSSF) { - jobject jglobal = (jobject) dest2java.mapInterface( - pSSF, cppu::UnoType::get()); + jobject jglobal = static_cast(dest2java.mapInterface( + pSSF, cppu::UnoType::get())); joSLL_cpp = pJEnv->NewLocalRef( jglobal ); pJEnv->DeleteGlobalRef( jglobal ); if (env) -- cgit