diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:14:53 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:25 +0100 |
commit | f19dda5a55156afda2c6dde6c51c455cc5657fc2 (patch) | |
tree | a0ec501f676cf5ec67aaf0eb3b8572dc1bad0db0 /extensions/source/plugin/base | |
parent | loplugin:nullptr (automatic rewrite) (diff) | |
download | core-f19dda5a55156afda2c6dde6c51c455cc5657fc2.tar.gz core-f19dda5a55156afda2c6dde6c51c455cc5657fc2.zip |
loplugin:nullptr (automatic rewrite)
Change-Id: I5bbef6c88255f3e8c740a5239a5010cf1251b7fa
Diffstat (limited to 'extensions/source/plugin/base')
-rw-r--r-- | extensions/source/plugin/base/context.cxx | 2 | ||||
-rw-r--r-- | extensions/source/plugin/base/manager.cxx | 8 | ||||
-rw-r--r-- | extensions/source/plugin/base/nfuncs.cxx | 12 | ||||
-rw-r--r-- | extensions/source/plugin/base/plctrl.cxx | 6 | ||||
-rw-r--r-- | extensions/source/plugin/base/service.cxx | 2 | ||||
-rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 38 |
6 files changed, 34 insertions, 34 deletions
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 02e6871261c0..478562aa7035 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -273,7 +273,7 @@ FileSink::FileSink( const Reference< css::uno::XComponentContext > & rxContext, m_xPlugin( plugin ), m_aTarget( target ) { - osl::FileBase::createTempFile( 0, 0, &m_aFileName ); + osl::FileBase::createTempFile( nullptr, nullptr, &m_aFileName ); OString aFile = OUStringToOString( m_aFileName, osl_getThreadTextEncoding() ); fp = fopen( aFile.getStr() , "wb" ); diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index 8b1d120733e7..0fa54e367c12 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -59,7 +59,7 @@ #include <cppuhelper/supportsservice.hxx> -PluginManager* PluginManager::pManager = NULL; +PluginManager* PluginManager::pManager = nullptr; PluginManager& PluginManager::get() { @@ -154,7 +154,7 @@ XPlugin_Impl* XPluginManager_Impl::getXPluginFromNPP( NPP instance ) return *iter; } - return NULL; + return nullptr; } XPlugin_Impl* XPluginManager_Impl::getPluginImplementation( const Reference< css::plugin::XPlugin >& plugin ) @@ -167,7 +167,7 @@ XPlugin_Impl* XPluginManager_Impl::getPluginImplementation( const Reference< css return *iter; } - return NULL; + return nullptr; } Sequence<css::plugin::PluginDescription> XPluginManager_Impl::getPluginDescriptions() @@ -226,7 +226,7 @@ Reference< css::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( con if( ! pImpl->getPluginComm() ) { pImpl->dispose(); - xRef = NULL; + xRef = nullptr; } return xRef; diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index 865fed5b88b8..21dbb45324dd 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -100,13 +100,13 @@ extern "C" { TRACE( "NPN_GetJavaEnv" ); // no java in this program - return NULL; + return nullptr; } jref SAL_CALL NP_LOADDS NPN_GetJavaPeer( NPP /*instance*/ ) { TRACE( "NPN_GetJavaPeer" ); - return NULL; + return nullptr; } } @@ -284,7 +284,7 @@ extern "C" { // stream will be fed back to plugin, // notify immediately after destruction of stream pImpl->addPluginEventListener( pListener ); - pListener = NULL; + pListener = nullptr; } pAsync->aUrl = OStringToOUString( aLoadURL, pImpl->getTextEncoding() ); pAsync->aTarget = OStringToOUString( target, pImpl->getTextEncoding() ); @@ -347,7 +347,7 @@ extern "C" { // stream will be fed back to plugin, // notify immediately after destruction of stream pImpl->addPluginEventListener( pListener ); - pListener = NULL; + pListener = nullptr; } try @@ -408,8 +408,8 @@ extern "C" { ::std::list<XPlugin_Impl*>& rList = PluginManager::get().getPlugins(); ::std::list<XPlugin_Impl*>::iterator iter; - XPlugin_Impl* pPlugin = NULL; - PluginStream* pStream = NULL; + XPlugin_Impl* pPlugin = nullptr; + PluginStream* pStream = nullptr; for( iter = rList.begin(); iter!= rList.end(); ++iter ) { pStream = (*iter)->getStreamFromNPStream( stream ); diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx index 0ff4c8c77564..918715599d4f 100644 --- a/extensions/source/plugin/base/plctrl.cxx +++ b/extensions/source/plugin/base/plctrl.cxx @@ -39,7 +39,7 @@ #include <toolkit/helper/vclunohelper.hxx> PluginControl_Impl::PluginControl_Impl() - : _pMultiplexer( NULL ) + : _pMultiplexer( nullptr ) , _nX( 0 ) , _nY( 0 ) , _nWidth( 100 ) @@ -48,7 +48,7 @@ PluginControl_Impl::PluginControl_Impl() , _bVisible(false) , _bInDesignMode(false) , _bEnable(true) - , _pSysChild(NULL) + , _pSysChild(nullptr) { } @@ -146,7 +146,7 @@ void PluginControl_Impl::releasePeer() { _xParentWindow->removeFocusListener( this ); _xPeerWindow->dispose(); - _pSysChild = NULL; + _pSysChild = nullptr; _xPeerWindow.clear(); _xPeer.clear(); getMultiplexer()->setPeer( Reference< css::awt::XWindow > () ); diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index 40c4824b28f6..f40de1dc4aa5 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -60,7 +60,7 @@ extern "C" { void* /*pXUnoKey*/ ) { - void* pRet = 0; + void* pRet = nullptr; OUString aImplName( OUString::createFromAscii( pImplementationName ) ); diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 133f072aa978..43d09edbf731 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -115,16 +115,16 @@ Any XPlugin_Impl::queryAggregation( const Type& type ) throw( RuntimeException, XPlugin_Impl::XPlugin_Impl( const uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) : PluginControl_Impl(), m_xSMgr( rSMgr ), - m_pPluginComm( NULL ), + m_pPluginComm( nullptr ), m_pSysPlugData( CreateSysPlugData() ), m_aEncoding( osl_getThreadTextEncoding() ), - m_pArgv( NULL ), - m_pArgn( NULL ), + m_pArgv( nullptr ), + m_pArgn( nullptr ), m_nArgs( 0 ), m_aPluginMode( NP_FULL ), m_nProvidingState( PROVIDING_NONE ), m_nCalledFromPlugin( 0 ), - m_pDisposer( NULL ), + m_pDisposer( nullptr ), m_bIsDisposed( false ) { memset( &m_aInstance, 0, sizeof( m_aInstance ) ); @@ -142,14 +142,14 @@ void XPlugin_Impl::destroyInstance() { Guard< Mutex > aGuard( m_aMutex ); - NPSavedData* pSavedData = NULL; + NPSavedData* pSavedData = nullptr; destroyStreams(); if( getPluginComm() ) { getPluginComm()->NPP_Destroy( this, &pSavedData ); getPluginComm()->decRef(); - m_pPluginComm = NULL; + m_pPluginComm = nullptr; } freeArgs(); @@ -212,7 +212,7 @@ IMPL_LINK_NOARG_TYPED( XPlugin_Impl, secondLevelDispose, void*, void ) if (m_pDisposer) { m_pDisposer->release(); - m_pDisposer = NULL; + m_pDisposer = nullptr; } uno::Reference< XPlugin > xProtection( this ); @@ -222,7 +222,7 @@ IMPL_LINK_NOARG_TYPED( XPlugin_Impl, secondLevelDispose, void*, void ) Guard< Mutex > aPluginGuard( ::PluginManager::get().getPluginMutex() ); rList.remove( this ); } - m_aNPWindow.window = NULL; + m_aNPWindow.window = nullptr; #ifndef UNX // acrobat does an unconditional XtParent on the windows widget getPluginComm()->NPP_SetWindow( this ); @@ -533,7 +533,7 @@ void XPlugin_Impl::loadPlugin() pEnvData->mpNSView ); #elif defined UNX // need a new PluginComm - PluginComm* pComm = NULL; + PluginComm* pComm = nullptr; int sv[2]; if( !socketpair( AF_UNIX, SOCK_STREAM, 0, sv ) ) pComm = new UnxPluginComm( m_aDescription.Mimetype, @@ -565,9 +565,9 @@ void XPlugin_Impl::loadPlugin() &getNPPInstance(), m_aPluginMode == PluginMode::FULL ? NP_FULL : NP_EMBED, ::sal::static_int_cast< int16_t, int >( m_nArgs ), - const_cast<char**>(m_nArgs ? m_pArgn : NULL), - const_cast<char**>(m_nArgs ? m_pArgv : NULL), - NULL ); + const_cast<char**>(m_nArgs ? m_pArgn : nullptr), + const_cast<char**>(m_nArgs ? m_pArgv : nullptr), + nullptr ); #ifdef MACOSX // m_aNPWindow is set up in the MacPluginComm from the view SetSysPlugDataParentView(*pEnvData); @@ -579,9 +579,9 @@ void XPlugin_Impl::loadPlugin() } else { - m_aNPWindow.window = NULL; + m_aNPWindow.window = nullptr; } - m_aNPWindow.ws_info = NULL; + m_aNPWindow.ws_info = nullptr; #else m_aNPWindow.window = (void*)pEnvData->hWnd; #endif @@ -645,7 +645,7 @@ PluginStream* XPlugin_Impl::getStreamFromNPStream( NPStream* stream ) if( &(*iter2)->getStream() == stream ) return *iter2; - return NULL; + return nullptr; } sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, @@ -966,7 +966,7 @@ PluginInputStream::PluginInputStream( XPlugin_Impl* pPlugin, sal_uInt32 len, sal_uInt32 lastmod ) : PluginStream( pPlugin, url, len, lastmod ), - m_pContent( NULL ), + m_pContent( nullptr ), m_nMode( NP_NORMAL ), m_nWritePos( 0 ) { @@ -975,7 +975,7 @@ PluginInputStream::PluginInputStream( XPlugin_Impl* pPlugin, m_pPlugin->getInputStreams().push_back( this ); OUString aTmpFile; - osl::FileBase::createTempFile( 0, 0, &aTmpFile ); + osl::FileBase::createTempFile( nullptr, nullptr, &aTmpFile ); // set correct extension, some plugins need that OUString aName( m_aNPStream.url, strlen( m_aNPStream.url ), m_pPlugin->getTextEncoding() ); @@ -993,7 +993,7 @@ PluginInputStream::PluginInputStream( XPlugin_Impl* pPlugin, if( ! m_aFileStream.IsOpen() ) { // might be that the extension scrambled the whole filename - osl::FileBase::createTempFile( 0, 0, &aTmpFile ); + osl::FileBase::createTempFile( nullptr, nullptr, &aTmpFile ); m_aFileStream.Open( aTmpFile, StreamMode::READ | StreamMode::WRITE ); } } @@ -1083,7 +1083,7 @@ void PluginInputStream::setMode( sal_Int32 nMode ) if (m_nMode == -1) { m_pPlugin->getInputStreams().remove( this ); - m_pPlugin = NULL; + m_pPlugin = nullptr; m_wPlugin.clear(); } } |