From 20cc8a453d3bc970ec4bfa899691027850bb8fe1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 13 Dec 2016 17:02:53 +0200 Subject: loplugin:nullptr Change-Id: I2cd1e82d86d8776155db2f70bc92c7c448f81ce0 --- ucb/source/ucp/webdav/SerfUnlockReqProcImpl.cxx | 2 +- ucb/source/ucp/webdav/SerfUri.cxx | 4 ++-- ucb/source/ucp/webdav/webdavcontent.cxx | 8 ++++---- ucb/source/ucp/webdav/webdavcontent.hxx | 2 +- ucb/source/ucp/webdav/webdavprovider.cxx | 2 +- ucb/source/ucp/webdav/webdavresponseparser.cxx | 2 +- ucb/source/ucp/webdav/webdavservices.cxx | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ucb') diff --git a/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.cxx index 59c8994f090f..53826ace67d7 100644 --- a/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.cxx @@ -40,7 +40,7 @@ serf_bucket_t * SerfUnlockReqProcImpl::createSerfRequestBucket( serf_request_t * serf_bucket_t *req_bkt = serf_request_bucket_request_create( inSerfRequest, "UNLOCK", getPathStr(), - 0, + nullptr, serf_request_get_alloc( inSerfRequest ) ); // set request header fields serf_bucket_t* hdrs_bkt = serf_bucket_request_get_headers( req_bkt ); diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx index 1c116791c1f2..565ece80d364 100644 --- a/ucb/source/ucp/webdav/SerfUri.cxx +++ b/ucb/source/ucp/webdav/SerfUri.cxx @@ -40,12 +40,12 @@ SerfUri::SerfUri( const apr_uri_t * inUri ) , mPort() , mPath() { - if ( inUri == 0 ) + if ( inUri == nullptr ) throw DAVException( DAVException::DAV_INVALID_ARG ); char * uri = apr_uri_unparse( apr_environment::AprEnv::getAprEnv()->getAprPool(), &mAprUri, 0 ); - if ( uri == 0 ) + if ( uri == nullptr ) throw DAVException( DAVException::DAV_INVALID_ARG ); init( &mAprUri ); diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 741363a7cfd4..0575d4d321d5 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -352,11 +352,11 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() { } - cppu::OTypeCollection * pCollection = 0; + cppu::OTypeCollection * pCollection = nullptr; if ( bFolder ) { - static cppu::OTypeCollection* pFolderTypes = 0; + static cppu::OTypeCollection* pFolderTypes = nullptr; pCollection = pFolderTypes; if ( !pCollection ) @@ -389,7 +389,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() } else { - static cppu::OTypeCollection* pDocumentTypes = 0; + static cppu::OTypeCollection* pDocumentTypes = nullptr; pCollection = pDocumentTypes; if ( !pCollection ) @@ -3365,7 +3365,7 @@ Content::ResourceType Content::getResourceType( // resource is NON_DAV eResourceType = NON_DAV; } - else if (networkAccessAllowed != 0) + else if (networkAccessAllowed != nullptr) { *networkAccessAllowed = *networkAccessAllowed && shouldAccessNetworkAfterException(e); diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index c0199d42af27..75e47cf2a6c3 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -120,7 +120,7 @@ private: ResourceType getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, const std::unique_ptr< DAVResourceAccess > & rResAccess, - bool * networkAccessAllowed = 0 ) + bool * networkAccessAllowed = nullptr ) throw ( css::uno::Exception ); // Command "open" diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 27250824741e..d843a6a22018 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -38,7 +38,7 @@ ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rContext ) : ::ucbhelper::ContentProviderImplHelper( rContext ), m_xDAVSessionFactory( new DAVSessionFactory() ), - m_pProps( 0 ) + m_pProps( nullptr ) { } diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index e30f67561a48..d7f30dd78479 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -372,7 +372,7 @@ namespace WebDAVResponseParser::WebDAVResponseParser(WebDAVResponseParserMode eWebDAVResponseParserMode) : maResult_PropFind(), maResult_PropName(), - mpContext(0), + mpContext(nullptr), maHref(), maStatus(), maResponseProperties(), diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx index 1b849e15c660..7454c54d5da2 100644 --- a/ucb/source/ucp/webdav/webdavservices.cxx +++ b/ucb/source/ucp/webdav/webdavservices.cxx @@ -28,7 +28,7 @@ using namespace com::sun::star; extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_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 ) ); -- cgit ption> LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/filter/source/graphicfilter/icgm/class5.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-02-06 22:31:43 +0100
committerJan Holesovsky <kendy@suse.cz>2013-02-06 22:31:43 +0100
commit8636a6d557772e6d566d59151b5ba559993faf0b (patch)
tree4dc9390364734187eceb80b413552abacb675648 /filter/source/graphicfilter/icgm/class5.cxx
parent53b715fc8afcd1f901d4a3e061255bec73f52668 (diff)
Dense B+ tree: Remove root / one level if possible.