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

[Julien Nabet]

 l10ntools/source/merge.cxx |    8 +++-----
 l10ntools/source/po.cxx    |    1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit a620a82a90614300a2df4133a85dd585b8fbfd20
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Feb 27 19:15:08 2016 +0100

    Add SAL_WARN + convert some printf into SAL_WARN
    
    Change-Id: I3760e50796605ce50ef2e91951fc839b84669b89
    Reviewed-on: https://gerrit.libreoffice.org/22733
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 8be78d0..3922e89 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -47,9 +47,7 @@ namespace
         }
         catch (const PoIfstream::Exception&)
         {
-            printf(
-                "Warning : %s contains invalid entry\n",
-                rFileName.getStr() );
+            SAL_WARN("l10ntools", rFileName.getStr() << " contains invalid entry\n");
             return false;
         }
         return true;
@@ -216,7 +214,7 @@ MergeDataFile::MergeDataFile(
     std::ifstream aInputStream( rFileName.getStr() );
     if ( !aInputStream.is_open() )
     {
-        printf("Warning : Can't open po path container file\n");
+        SAL_WARN("l10ntools", "Can't open po path container file for " << rFileName.getStr());
         return;
     }
     std::string sPoFile;
@@ -233,7 +231,7 @@ MergeDataFile::MergeDataFile(
         aPoInput.open( sPoFileName );
         if ( !aPoInput.isOpen() )
         {
-            printf( "Warning : Can't open %s\n", sPoFileName.getStr() );
+            SAL_WARN("l10ntools", "Can't open file: " << sPoFileName.getStr());
             return;
         }
 
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 3019006c..6aa7c1d 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -596,6 +596,7 @@ void PoIfstream::readEntry( PoEntry& rPoEntry )
         }
         else
         {
+            SAL_WARN("l10ntools", "Parse problem with entry: " << aGenPo.getMsgStr());
             throw PoIfstream::Exception();
         }
     }