Kaydet (Commit) 6794c2e4 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:nullptr (automatic rewrite)

Change-Id: I89aa17e66c502e81089f42578b45097f44de4ea9
üst 22980bea
...@@ -70,7 +70,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( ...@@ -70,7 +70,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
{ {
try try
{ {
if (0 != jpairs) if (nullptr != jpairs)
{ {
jsize nPos = 0, len = jni_env->GetArrayLength( jpairs ); jsize nPos = 0, len = jni_env->GetArrayLength( jpairs );
while (nPos < len) while (nPos < len)
...@@ -82,7 +82,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( ...@@ -82,7 +82,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
jni_env->ExceptionClear(); jni_env->ExceptionClear();
throw RuntimeException( "index out of bounds?!" ); throw RuntimeException( "index out of bounds?!" );
} }
if (0 != jstr) if (nullptr != jstr)
{ {
OUString name( ::javaunohelper::jstring_to_oustring( jstr, jni_env ) ); OUString name( ::javaunohelper::jstring_to_oustring( jstr, jni_env ) );
// value // value
...@@ -92,7 +92,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( ...@@ -92,7 +92,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
jni_env->ExceptionClear(); jni_env->ExceptionClear();
throw RuntimeException( "index out of bounds?!" ); throw RuntimeException( "index out of bounds?!" );
} }
if (0 != jstr) if (nullptr != jstr)
{ {
OUString value( ::javaunohelper::jstring_to_oustring( jstr, jni_env ) ); OUString value( ::javaunohelper::jstring_to_oustring( jstr, jni_env ) );
...@@ -106,7 +106,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( ...@@ -106,7 +106,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
// bootstrap uno // bootstrap uno
Reference< XComponentContext > xContext; Reference< XComponentContext > xContext;
if (0 == juno_rc) if (nullptr == juno_rc)
{ {
xContext = ::cppu::defaultBootstrap_InitialComponentContext(); xContext = ::cppu::defaultBootstrap_InitialComponentContext();
} }
...@@ -126,7 +126,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( ...@@ -126,7 +126,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
OUString cpp_env_name = CPPU_CURRENT_LANGUAGE_BINDING_NAME; OUString cpp_env_name = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
OUString java_env_name = UNO_LB_JAVA; OUString java_env_name = UNO_LB_JAVA;
Environment java_env, cpp_env; Environment java_env, cpp_env;
uno_getEnvironment(reinterpret_cast<uno_Environment **>(&cpp_env), cpp_env_name.pData, NULL); uno_getEnvironment(reinterpret_cast<uno_Environment **>(&cpp_env), cpp_env_name.pData, nullptr);
uno_getEnvironment(reinterpret_cast<uno_Environment **>(&java_env), java_env_name.pData, vm_access.get() ); uno_getEnvironment(reinterpret_cast<uno_Environment **>(&java_env), java_env_name.pData, vm_access.get() );
// map to java // map to java
...@@ -148,7 +148,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( ...@@ -148,7 +148,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
catch (const RuntimeException & exc) catch (const RuntimeException & exc)
{ {
jclass c = jni_env->FindClass( "com/sun/star/uno/RuntimeException" ); jclass c = jni_env->FindClass( "com/sun/star/uno/RuntimeException" );
if (0 != c) if (nullptr != c)
{ {
OString cstr( OUStringToOString( OString cstr( OUStringToOString(
exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
...@@ -159,7 +159,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( ...@@ -159,7 +159,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
catch (const Exception & exc) catch (const Exception & exc)
{ {
jclass c = jni_env->FindClass( "com/sun/star/uno/Exception" ); jclass c = jni_env->FindClass( "com/sun/star/uno/Exception" );
if (0 != c) if (nullptr != c)
{ {
OString cstr( OUStringToOString( OString cstr( OUStringToOString(
exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); exc.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
...@@ -168,7 +168,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( ...@@ -168,7 +168,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
} }
} }
return 0; return nullptr;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -55,7 +55,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( ...@@ -55,7 +55,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
{ {
bool bRet = false; bool bRet = false;
const jchar* pJLibName = pJEnv->GetStringChars(jLibName, NULL); const jchar* pJLibName = pJEnv->GetStringChars(jLibName, nullptr);
OUString aLibName(pJLibName); OUString aLibName(pJLibName);
pJEnv->ReleaseStringChars(jLibName, pJLibName); pJEnv->ReleaseStringChars(jLibName, pJLibName);
...@@ -77,13 +77,13 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( ...@@ -77,13 +77,13 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
{ {
Environment java_env, loader_env; Environment java_env, loader_env;
const sal_Char * pEnvTypeName = 0; const sal_Char * pEnvTypeName = nullptr;
(*reinterpret_cast<component_getImplementationEnvironmentFunc>(pSym))( (*reinterpret_cast<component_getImplementationEnvironmentFunc>(pSym))(
&pEnvTypeName, reinterpret_cast<uno_Environment **>(&loader_env) ); &pEnvTypeName, reinterpret_cast<uno_Environment **>(&loader_env) );
if (! loader_env.is()) if (! loader_env.is())
{ {
OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) ); OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
uno_getEnvironment( reinterpret_cast<uno_Environment **>(&loader_env), aEnvTypeName.pData, 0 ); uno_getEnvironment( reinterpret_cast<uno_Environment **>(&loader_env), aEnvTypeName.pData, nullptr );
} }
// create vm access // create vm access
...@@ -138,7 +138,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( ...@@ -138,7 +138,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jLibName, jstring jImplName, JNIEnv * pJEnv, SAL_UNUSED_PARAMETER jclass, jstring jLibName, jstring jImplName,
jobject jSMgr, jobject jRegKey, jobject loader ) jobject jSMgr, jobject jRegKey, jobject loader )
{ {
const jchar* pJLibName = pJEnv->GetStringChars(jLibName, NULL); const jchar* pJLibName = pJEnv->GetStringChars(jLibName, nullptr);
OUString aLibName(pJLibName); OUString aLibName(pJLibName);
pJEnv->ReleaseStringChars(jLibName, pJLibName); pJEnv->ReleaseStringChars(jLibName, pJLibName);
...@@ -153,7 +153,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( ...@@ -153,7 +153,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
aLibName += SAL_DLLEXTENSION; aLibName += SAL_DLLEXTENSION;
jobject joSLL_cpp = 0; jobject joSLL_cpp = nullptr;
#ifndef DISABLE_DYNLOADING #ifndef DISABLE_DYNLOADING
osl::Module lib(aLibName, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL); osl::Module lib(aLibName, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL);
...@@ -167,14 +167,14 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( ...@@ -167,14 +167,14 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
{ {
Environment java_env, loader_env; Environment java_env, loader_env;
const sal_Char * pEnvTypeName = 0; const sal_Char * pEnvTypeName = nullptr;
(*reinterpret_cast<component_getImplementationEnvironmentFunc>(pSym))( (*reinterpret_cast<component_getImplementationEnvironmentFunc>(pSym))(
&pEnvTypeName, reinterpret_cast<uno_Environment **>(&loader_env) ); &pEnvTypeName, reinterpret_cast<uno_Environment **>(&loader_env) );
if (! loader_env.is()) if (! loader_env.is())
{ {
OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) ); OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
uno_getEnvironment( reinterpret_cast<uno_Environment **>(&loader_env), aEnvTypeName.pData, 0 ); uno_getEnvironment( reinterpret_cast<uno_Environment **>(&loader_env), aEnvTypeName.pData, nullptr );
} }
// create vm access // create vm access
...@@ -201,7 +201,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( ...@@ -201,7 +201,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
java2dest.mapInterface( java2dest.mapInterface(
jRegKey, cppu::UnoType<registry::XRegistryKey>::get()); jRegKey, cppu::UnoType<registry::XRegistryKey>::get());
const char* pImplName = pJEnv->GetStringUTFChars( jImplName, NULL ); const char* pImplName = pJEnv->GetStringUTFChars( jImplName, nullptr );
void * pSSF = (*reinterpret_cast<component_getFactoryFunc>(pSym))( void * pSSF = (*reinterpret_cast<component_getFactoryFunc>(pSym))(
pImplName, pSMgr, pKey ); pImplName, pSMgr, pKey );
......
...@@ -72,9 +72,9 @@ static bool inited_juhx( JNIEnv * jni_env ) ...@@ -72,9 +72,9 @@ static bool inited_juhx( JNIEnv * jni_env )
s_bootstrap = s_bootstrap =
reinterpret_cast<javaunohelper::detail::Func_bootstrap *>(aModule.getFunctionSymbol(symbol)); reinterpret_cast<javaunohelper::detail::Func_bootstrap *>(aModule.getFunctionSymbol(symbol));
if (0 == s_writeInfo || if (nullptr == s_writeInfo ||
0 == s_getFactory || nullptr == s_getFactory ||
0 == s_bootstrap) nullptr == s_bootstrap)
{ {
jclass c = jni_env->FindClass( "java/lang/RuntimeException" ); jclass c = jni_env->FindClass( "java/lang/RuntimeException" );
jni_env->ThrowNew( jni_env->ThrowNew(
...@@ -107,7 +107,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( ...@@ -107,7 +107,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
if (inited_juhx( pJEnv )) if (inited_juhx( pJEnv ))
return (*s_getFactory)( return (*s_getFactory)(
pJEnv, jClass, jLibName, jImplName, jSMgr, jRegKey, loader ); pJEnv, jClass, jLibName, jImplName, jSMgr, jRegKey, loader );
return 0; return nullptr;
} }
SAL_DLLPUBLIC_EXPORT jobject JNICALL SAL_DLLPUBLIC_EXPORT jobject JNICALL
...@@ -117,7 +117,7 @@ Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap( ...@@ -117,7 +117,7 @@ Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
{ {
if (inited_juhx( jni_env )) if (inited_juhx( jni_env ))
return (*s_bootstrap)( jni_env, jClass, juno_rc, jpairs, loader ); return (*s_bootstrap)( jni_env, jClass, juno_rc, jpairs, loader );
return 0; return nullptr;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment