diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2013-05-08 01:46:40 +0200 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-05-08 08:40:07 +0000 |
| commit | 02beb614750eadc2de8ffc4bcd67ae286f9f0856 (patch) | |
| tree | d0592b4984395476f054368e194ba790256a9dde /l10ntools | |
| parent | dc5bb7dfa70967e3445e5427168e4103e86b129c (diff) | |
coverity#982460: Explicit null dereferenced
Change-Id: I64d559603bff0d618dce72927566531296984d3c
Reviewed-on: https://gerrit.libreoffice.org/3823
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/xrmmerge.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index 8a8b8563aab3..8265b4afcbb1 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -381,11 +381,10 @@ XRMResMerge::XRMResMerge( sFilename( rFilename ) , pResData( NULL ) { - if (!rMergeSource.isEmpty()) + if (!rMergeSource.isEmpty() && sLanguage.equalsIgnoreAsciiCase("ALL")) + { pMergeDataFile = new MergeDataFile( rMergeSource, sInputFileName, false); - if( sLanguage.equalsIgnoreAsciiCase("ALL") ) - { aLanguages = pMergeDataFile->GetLanguages(); } else |