diff options
Diffstat (limited to 'l10ntools/source/treemerge.cxx')
| -rw-r--r-- | l10ntools/source/treemerge.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx index 049f272b5335..b98b0621e952 100644 --- a/l10ntools/source/treemerge.cxx +++ b/l10ntools/source/treemerge.cxx @@ -119,7 +119,7 @@ namespace replaceAll("$[officeversion]","%PRODUCTVERSION"); xmlNodeSetContent( pReturn, - xmlEncodeSpecialChars( NULL, + xmlEncodeSpecialChars( nullptr, reinterpret_cast<const xmlChar*>( sNewTitle.getStr() ))); xmlFree( sTitle ); @@ -131,7 +131,7 @@ namespace std::cerr << "Treex error: Cannot find title in " << sXhpPath.getStr() << std::endl; - return 0; + return nullptr; } xmlFree( pXhpFile ); xmlCleanupParser(); @@ -200,7 +200,7 @@ namespace TreeParser::TreeParser( const OString& rInputFile, const OString& rLang ) - : m_pSource( 0 ) + : m_pSource( nullptr ) , m_sLang( rLang ) , m_bIsInitialized( false ) { @@ -253,7 +253,7 @@ void TreeParser::Merge( assert( m_bIsInitialized ); const xmlNodePtr pRootNode = xmlDocGetRootElement( m_pSource ); - MergeDataFile* pMergeDataFile = 0; + MergeDataFile* pMergeDataFile = nullptr; if( m_sLang != "qtz" && m_sLang != "en-US" ) { pMergeDataFile = new MergeDataFile( |