diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:26:59 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:55 +0100 |
commit | b4af1664402ce1008e168d18e5e10b5d8f946f1c (patch) | |
tree | ebbbeca9ce190b95ad4fe0dd74a5ead68df6f546 /ucbhelper | |
parent | 05b4902145b0924393b5ae4d9e9dfb92d2926b99 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I3003db8a411740db48c2e0c6ecd81a7fd9209e6c
Diffstat (limited to 'ucbhelper')
-rw-r--r-- | ucbhelper/source/client/content.cxx | 10 | ||||
-rw-r--r-- | ucbhelper/source/provider/contenthelper.cxx | 16 | ||||
-rw-r--r-- | ucbhelper/source/provider/contentidentifier.cxx | 2 | ||||
-rw-r--r-- | ucbhelper/source/provider/contentinfo.cxx | 8 | ||||
-rw-r--r-- | ucbhelper/source/provider/fd_inputstream.cxx | 6 | ||||
-rw-r--r-- | ucbhelper/source/provider/interactionrequest.cxx | 14 | ||||
-rw-r--r-- | ucbhelper/source/provider/resultset.cxx | 8 | ||||
-rw-r--r-- | ucbhelper/source/provider/resultsethelper.cxx | 4 | ||||
-rw-r--r-- | ucbhelper/source/provider/simplenameclashresolverequest.cxx | 2 |
9 files changed, 35 insertions, 35 deletions
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 31e1b2f5cf9e..5962255dfcf2 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -1042,7 +1042,7 @@ bool Content::transferContent( const Content& rSourceContent, } Any aRet = pBroker->execute( aCommand, 0, m_xImpl->getEnvironment() ); - if ( pResultURL != NULL ) + if ( pResultURL != nullptr ) aRet >>= *pResultURL; return true; } @@ -1151,7 +1151,7 @@ void Content_Impl::reinit( const Reference< XContent >& xContent ) { osl::MutexGuard aGuard( m_aMutex ); - m_xCommandProcessor = 0; + m_xCommandProcessor = nullptr; // #92581# - Don't reset m_aURL!!! @@ -1183,7 +1183,7 @@ void Content_Impl::reinit( const Reference< XContent >& xContent ) // content object again if demanded ( --> Content_Impl::getContent() ) getURL(); - m_xContent = 0; + m_xContent = nullptr; } } @@ -1216,8 +1216,8 @@ void Content_Impl::disposing( const EventObject& Source ) xContent = m_xContent; m_aURL.clear(); - m_xCommandProcessor = 0; - m_xContent = 0; + m_xCommandProcessor = nullptr; + m_xContent = nullptr; } if ( xContent.is() ) diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index 7621e8ebe381..4e75bdc555df 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -98,11 +98,11 @@ struct ContentImplHelper_Impl PropertyChangeListeners* m_pPropertyChangeListeners; ContentImplHelper_Impl() - : m_pDisposeEventListeners( 0 ), - m_pContentEventListeners( 0 ), - m_pPropSetChangeListeners( 0 ), - m_pCommandChangeListeners( 0 ), - m_pPropertyChangeListeners( 0 ) {} + : m_pDisposeEventListeners( nullptr ), + m_pContentEventListeners( nullptr ), + m_pPropSetChangeListeners( nullptr ), + m_pCommandChangeListeners( nullptr ), + m_pPropertyChangeListeners( nullptr ) {} ~ContentImplHelper_Impl() { @@ -554,7 +554,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name ) throw; } - xContainer = 0; + xContainer = nullptr; // Success! @@ -566,7 +566,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name ) if ( xReg.is() ) { OUString aKey( xSet->getKey() ); - xSet = 0; + xSet = nullptr; xReg->removePropertySet( aKey ); } } @@ -722,7 +722,7 @@ void ContentImplHelper::notifyPropertiesChange( cppu::OInterfaceIteratorHelper aIter( *pPropsContainer ); while ( aIter.hasMoreElements() ) { - PropertyEventSequence* p = NULL; + PropertyEventSequence* p = nullptr; beans::XPropertiesChangeListener* pListener = static_cast< beans::XPropertiesChangeListener * >( diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index 29c45d075635..dfd25cdf167f 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -146,7 +146,7 @@ Sequence< com::sun::star::uno::Type > SAL_CALL ContentIdentifier::getTypes() throw( RuntimeException, std::exception ) { - static cppu::OTypeCollection* pCollection = NULL; + static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index b3f0ca9d95a2..cf38231fa8c3 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -46,7 +46,7 @@ PropertySetInfo::PropertySetInfo( const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rxEnv, ContentImplHelper* pContent ) : m_xEnv( rxEnv ), - m_pProps( 0 ), + m_pProps( nullptr ), m_pContent( pContent ) { } @@ -191,7 +191,7 @@ void PropertySetInfo::reset() { osl::MutexGuard aGuard( m_aMutex ); delete m_pProps; - m_pProps = 0; + m_pProps = nullptr; } @@ -229,7 +229,7 @@ CommandProcessorInfo::CommandProcessorInfo( const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rxEnv, ContentImplHelper* pContent ) : m_xEnv( rxEnv ), - m_pCommands( 0 ), + m_pCommands( nullptr ), m_pContent( pContent ) { } @@ -377,7 +377,7 @@ void CommandProcessorInfo::reset() { osl::MutexGuard aGuard( m_aMutex ); delete m_pCommands; - m_pCommands = 0; + m_pCommands = nullptr; } diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx index 26efac00832f..f4f708501cbb 100644 --- a/ucbhelper/source/provider/fd_inputstream.cxx +++ b/ucbhelper/source/provider/fd_inputstream.cxx @@ -35,7 +35,7 @@ namespace ucbhelper , m_nLength( 0 ) { if ( !m_tmpfl ) - osl_createTempFile( NULL, &m_tmpfl, NULL ); + osl_createTempFile( nullptr, &m_tmpfl, nullptr ); OSL_ENSURE( m_tmpfl, "input stream without tempfile!" ); if ( osl_setFilePos( m_tmpfl, osl_Pos_End, 0 ) == osl_File_E_None ) @@ -50,7 +50,7 @@ namespace ucbhelper FdInputStream::~FdInputStream() { - if ( 0 != m_tmpfl) + if ( nullptr != m_tmpfl) osl_closeFile(m_tmpfl); } @@ -127,7 +127,7 @@ namespace ucbhelper { osl::MutexGuard aGuard(m_aMutex); if(m_tmpfl) - osl_closeFile(m_tmpfl),m_tmpfl = 0; + osl_closeFile(m_tmpfl),m_tmpfl = nullptr; } diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index 6815a11c6771..a4e53c9fb278 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -158,7 +158,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId() uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes() throw( uno::RuntimeException, std::exception ) { - static cppu::OTypeCollection* pCollection = 0; + static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); @@ -293,7 +293,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId() uno::Sequence< uno::Type > SAL_CALL InteractionAbort::getTypes() throw( uno::RuntimeException, std::exception ) { - static cppu::OTypeCollection* pCollection = 0; + static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); @@ -383,7 +383,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId() uno::Sequence< uno::Type > SAL_CALL InteractionRetry::getTypes() throw( uno::RuntimeException, std::exception ) { - static cppu::OTypeCollection* pCollection = 0; + static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); @@ -473,7 +473,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId() uno::Sequence< uno::Type > SAL_CALL InteractionApprove::getTypes() throw( uno::RuntimeException, std::exception ) { - static cppu::OTypeCollection* pCollection = 0; + static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); @@ -563,7 +563,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId() uno::Sequence< uno::Type > SAL_CALL InteractionDisapprove::getTypes() throw( uno::RuntimeException, std::exception ) { - static cppu::OTypeCollection* pCollection = 0; + static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); @@ -655,7 +655,7 @@ InteractionSupplyAuthentication::getImplementationId() uno::Sequence< uno::Type > SAL_CALL InteractionSupplyAuthentication::getTypes() throw( uno::RuntimeException, std::exception ) { - static cppu::OTypeCollection* pCollection = 0; + static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); @@ -907,7 +907,7 @@ InteractionReplaceExistingData::getImplementationId() uno::Sequence< uno::Type > SAL_CALL InteractionReplaceExistingData::getTypes() throw( uno::RuntimeException, std::exception ) { - static cppu::OTypeCollection* pCollection = 0; + static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 417396b9e2df..ef7f45bed868 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -66,10 +66,10 @@ static const PropertyInfo aPropertyTable[] = beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY, &sal_Int32_getCppuType }, - { 0, + { nullptr, 0, 0, - 0 + nullptr } }; @@ -178,8 +178,8 @@ inline ResultSet_Impl::ResultSet_Impl( m_xEnv( rxEnv ), m_aProperties( rProperties ), m_xDataSupplier( rDataSupplier ), - m_pDisposeEventListeners( 0 ), - m_pPropertyChangeListeners( 0 ), + m_pDisposeEventListeners( nullptr ), + m_pPropertyChangeListeners( nullptr ), m_nPos( 0 ), // Position is one-based. Zero means: before first element. m_bWasNull( false ), m_bAfterLast( false ) diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index 63bb5cda3ff1..37a30d1a6961 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -52,7 +52,7 @@ namespace ucbhelper { ResultSetImplHelper::ResultSetImplHelper( const uno::Reference< uno::XComponentContext >& rxContext, const com::sun::star::ucb::OpenCommandArgument2& rCommand ) -: m_pDisposeEventListeners( 0 ), +: m_pDisposeEventListeners( nullptr ), m_bStatic( false ), m_bInitDone( false ), m_aCommand( rCommand ), @@ -272,7 +272,7 @@ void SAL_CALL ResultSetImplHelper::connectToCache( if ( xStubFactory.is() ) { xStubFactory->connectToCache( - this, xCache, m_aCommand.SortingInfo, 0 ); + this, xCache, m_aCommand.SortingInfo, nullptr ); return; } } diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx index 76a3ff13fe60..7d74640872a2 100644 --- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx +++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx @@ -113,7 +113,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyName::getImplementationId() uno::Sequence< uno::Type > SAL_CALL InteractionSupplyName::getTypes() throw( uno::RuntimeException, std::exception ) { - static cppu::OTypeCollection* pCollection = 0; + static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); |