diff options
Diffstat (limited to 'l10ntools/source/xrmmerge.cxx')
| -rw-r--r-- | l10ntools/source/xrmmerge.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index 480ec2913b34..230f6a62f7fb 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -49,7 +49,7 @@ OString sOutputFile; OString sMergeSrc; OString sLangAttribute; OString sResourceType; -XRMResParser *pParser = NULL; +XRMResParser *pParser = nullptr; extern "C" { // the whole interface to lexer is in this extern "C" section @@ -116,7 +116,7 @@ extern FILE *GetXrmFile() } } // this means the file could not be opened - return NULL; + return nullptr; } int WorkOnTokenSet( int nTyp, char *pTokenText ) @@ -372,7 +372,7 @@ XRMResMerge::XRMResMerge( const OString &rMergeSource, const OString &rOutputFile, const OString &rFilename ) : XRMResParser(), - pMergeDataFile( NULL ), + pMergeDataFile( nullptr ), sFilename( rFilename ) { if (!rMergeSource.isEmpty() && sLanguage.equalsIgnoreAsciiCase("ALL")) |