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

[Julien Nabet]

 include/sal/log-areas.dox      |    4 ++++
 l10ntools/source/helpmerge.cxx |    9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit b11dc22caa903014c295bea62a6d86e5e12518d8
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Jul 22 00:08:40 2013 +0200

    coverity#1038312: Dereference before null check
    
    Change-Id: Ibe9babbe8610bf70a80b819e21d24c6572436092
    Reviewed-on: https://gerrit.libreoffice.org/5015
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 95ec6f1..a78abda 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -176,6 +176,10 @@ certain functionality.
 @li @c jfw.level1
 @li @c jfw.level2
 
+ at section l10ntools
+
+ at li @c l10ntools
+
 @section Math
 
 @li @c starmath
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index d79dfae..161362e 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -263,11 +263,12 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString& sCur , ResDa
                     aLangHM->erase( sCur );
                 }
             }
-            else if( pResData == NULL )
+            else if( pResData )
             {
-                fprintf(stdout,"Can't find GID=%s LID=%s TYP=%s\n",
-                    pResData->sGId.getStr(), pResData->sId.getStr(),
-                    pResData->sResTyp.getStr());
+                SAL_WARN(
+                    "l10ntools",
+                    "Can't find GID=" << pResData->sGId.getStr() << " LID="
+                        << pResData->sId.getStr() << " TYP=" << pResData->sResTyp.getStr() << "\n");
             }
             pXMLElement->ChangeLanguageTag(
                 OStringToOUString(sCur, RTL_TEXTENCODING_ASCII_US));