diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:26:52 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:55 +0100 |
commit | 05b4902145b0924393b5ae4d9e9dfb92d2926b99 (patch) | |
tree | 24ae58a44bf1239ab96d34cc9028118261b2d3ff /ucb/source/ucp/package | |
parent | 1c4f33b5d8ba6a8cebb0235bb2e7e37e33045a5b (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I72bf3e008a8941d6e0fdea81b6b3e4a959ff28c5
Diffstat (limited to 'ucb/source/ucp/package')
-rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 12 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgprovider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgservices.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index ecdbe2d34af0..c0929f272865 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -165,7 +165,7 @@ Content* Content::create( { // Client explicitly requested a folder! if ( !aProps.bIsFolder ) - return 0; + return nullptr; } uno::Reference< ucb::XContentIdentifier > xId @@ -205,7 +205,7 @@ Content* Content::create( const ucb::ContentInfo& Info ) { if ( Info.Type.isEmpty() ) - return 0; + return nullptr; PackageUri aURI( Identifier->getContentIdentifier() ); @@ -213,7 +213,7 @@ Content* Content::create( getContentType( aURI.getScheme(), true ) ) && !Info.Type.equalsIgnoreAsciiCase( getContentType( aURI.getScheme(), false ) ) ) - return 0; + return nullptr; uno::Reference< container::XHierarchicalNameAccess > xPackage; @@ -326,11 +326,11 @@ XTYPEPROVIDER_COMMON_IMPL( Content ); uno::Sequence< uno::Type > SAL_CALL Content::getTypes() throw( uno::RuntimeException, std::exception ) { - cppu::OTypeCollection * pCollection = 0; + cppu::OTypeCollection * pCollection = nullptr; if ( isFolder() ) { - static cppu::OTypeCollection* pFolderTypes = 0; + static cppu::OTypeCollection* pFolderTypes = nullptr; pCollection = pFolderTypes; if ( !pCollection ) @@ -363,7 +363,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() } else { - static cppu::OTypeCollection* pDocumentTypes = 0; + static cppu::OTypeCollection* pDocumentTypes = nullptr; pCollection = pDocumentTypes; if ( !pCollection ) diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 3a0ed717b723..64ebe11b3f69 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -106,7 +106,7 @@ using namespace package_ucp; ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rxContext ) : ::ucbhelper::ContentProviderImplHelper( rxContext ), - m_pPackages( 0 ) + m_pPackages( nullptr ) { } diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index da77c329b048..256ce82fcfbe 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -28,7 +28,7 @@ using namespace com::sun::star; extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucppkg1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { - void * pRet = 0; + void * pRet = nullptr; uno::Reference< lang::XMultiServiceFactory > xSMgr( static_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); |