[Libreoffice-commits] core.git: l10ntools/source

[Julien Nabet]

 l10ntools/source/xrmmerge.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 02beb614750eadc2de8ffc4bcd67ae286f9f0856
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed May 8 01:46:40 2013 +0200

    coverity#982460: Explicit null dereferenced
    
    Change-Id: I64d559603bff0d618dce72927566531296984d3c
    Reviewed-on: https://gerrit.libreoffice.org/3823
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 8a8b856..8265b4a 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