diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:53 +0100 |
| commit | 01b49802c7cda7fd4d5ba71263cef7bc95234b89 (patch) | |
| tree | b8d92f1c6abf5ac548d0bcb0c581ebfcffd8bfac /sw/qa/extras/mailmerge | |
| parent | 6cd7bf2043146a630925a2e49336f02c802f707a (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/qa/extras/mailmerge')
| -rw-r--r-- | sw/qa/extras/mailmerge/mailmerge.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 6f95565e7d9b..992ddd5ddeb0 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -92,7 +92,7 @@ public: DBuriMap::const_iterator pos = aDBuriMap.find( aURI ); if (pos == aDBuriMap.end()) { - aDBName = SwDBManager::LoadAndRegisterDataSource( aURI, NULL, &aWorkDir ); + aDBName = SwDBManager::LoadAndRegisterDataSource( aURI, nullptr, &aWorkDir ); aDBuriMap.insert( std::pair< OUString, OUString >( aURI, aDBName ) ); std::cout << "New datasource name: '" << aDBName << "'" << std::endl; } @@ -170,7 +170,7 @@ public: xmlDocPtr parseMailMergeExport(int number, const OUString& rStreamName = OUString("word/document.xml")) { if (mnCurOutputType != text::MailMergeType::FILE) - return 0; + return nullptr; OUString name = mailMergeOutputPrefix + OUString::number( number ) + ".odt"; return parseExportInternal( mailMergeOutputURL + "/" + name, rStreamName ); |