From 4730b58d9989512ed25790768ba78decfde7d667 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 Nov 2015 10:12:56 +0100 Subject: loplugin:nullptr (automatic rewrite) Change-Id: I17eb40b2923793280ea220e519f97563c8490a19 --- cppu/source/uno/cascade_mapping.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'cppu/source/uno/cascade_mapping.cxx') diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index a5295bce9d6b..3033545637fb 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -145,16 +145,16 @@ void MediatorMapping::mapInterface( void * pInterface, typelib_InterfaceTypeDescription * pInterfaceTypeDescr) { - if (*ppOut != 0) + if (*ppOut != nullptr) { uno_ExtEnvironment * env = m_to.get()->pExtEnv; - OSL_ASSERT( env != 0 ); + OSL_ASSERT( env != nullptr ); env->releaseInterface( env, *ppOut ); - *ppOut = NULL; + *ppOut = nullptr; } - void * ret = 0; - uno_Interface * pUnoI = 0; + void * ret = nullptr; + uno_Interface * pUnoI = nullptr; m_from.invoke(s_mapInterface_v, &pUnoI, pInterface, pInterfaceTypeDescr, m_from2uno.get()); @@ -247,7 +247,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, // reaching this point means, we need a mediated mapping!!! // we generally mediate via uno[:free] - uno_Environment * pInterm = NULL; + uno_Environment * pInterm = nullptr; // chained uno -> uno if (from_envType == uno_envType && to_envType == uno_envType) @@ -286,7 +286,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, uno_envDcp += rest.copy(0, index); } - uno_getEnvironment(&pInterm, uno_envDcp.pData, NULL); + uno_getEnvironment(&pInterm, uno_envDcp.pData, nullptr); } else if (from_envType != uno_envType && to_envType == uno_envType) // -> UNO ? // mediate via uno:purpose(fromEnv) @@ -294,7 +294,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, rtl::OUString envDcp = uno_envType; envDcp += from_envPurpose; - uno_getEnvironment(&pInterm, envDcp.pData, NULL); + uno_getEnvironment(&pInterm, envDcp.pData, nullptr); } else if (from_envType == uno_envType && to_envType != uno_envType) // UNO -> ? // mediate via uno(context) @@ -302,7 +302,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, rtl::OUString envDcp = uno_envType; envDcp += to_envPurpose; - uno_getEnvironment(&pInterm, envDcp.pData, NULL); + uno_getEnvironment(&pInterm, envDcp.pData, nullptr); } else // everything else // mediate via uno:purpose @@ -312,7 +312,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, rtl::OUString uno_envDcp = uno_envType; uno_envDcp += purpose; - uno_getEnvironment(&pInterm, uno_envDcp.pData, NULL); + uno_getEnvironment(&pInterm, uno_envDcp.pData, nullptr); } uno_Mapping * pMapping = new MediatorMapping(pFrom, pInterm, pTo); -- cgit