diff options
Diffstat (limited to 'sw/qa/extras/mailmerge/mailmerge.cxx')
| -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 ); |