diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:20:43 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:33 +0100 |
commit | 1fc2fe74f2db49b17abc3c4df7feec4f215052ca (patch) | |
tree | 0844e3989c0febb1774b5471458314c9c592b103 /package/source/manifest | |
parent | 72d944181179fa3287a49cf72edb135a77782198 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I1e5338558bc57afe51db57655550e9b7246f7214
Diffstat (limited to 'package/source/manifest')
-rw-r--r-- | package/source/manifest/ManifestExport.cxx | 2 | ||||
-rw-r--r-- | package/source/manifest/UnoRegister.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index b7a6acb9864a..2c12b5f574d1 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -197,7 +197,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa ::comphelper::AttributeList *pAttrList = new ::comphelper::AttributeList; const beans::PropertyValue *pValue = pSequence[i].getConstArray(); OUString aString; - const uno::Any *pVector = NULL, *pSalt = NULL, *pIterationCount = NULL, *pDigest = NULL, *pDigestAlg = NULL, *pEncryptAlg = NULL, *pStartKeyAlg = NULL, *pDerivedKeySize = NULL; + const uno::Any *pVector = nullptr, *pSalt = nullptr, *pIterationCount = nullptr, *pDigest = nullptr, *pDigestAlg = nullptr, *pEncryptAlg = nullptr, *pStartKeyAlg = nullptr, *pDerivedKeySize = nullptr; for (sal_uInt32 j = 0, nNum = pSequence[i].getLength(); j < nNum; j++, pValue++) { if (pValue->Name.equals (sMediaTypeProperty) ) diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx index f453512d4c78..2a15147abe5f 100644 --- a/package/source/manifest/UnoRegister.cxx +++ b/package/source/manifest/UnoRegister.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star::packages; extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL package2_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { - void * pRet = 0; + void * pRet = nullptr; uno::Reference< XMultiServiceFactory > xSMgr( static_cast< XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< XSingleServiceFactory > xFactory; |