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

Tor Lillqvist tml at collabora.com
Fri Mar 28 06:52:01 PDT 2014


 vcl/source/filter/graphicfilter.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 26ea01a41978ba503119f8a758eb842a41e74a6c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Mar 28 15:17:43 2014 +0200

    Use SAL_WARN_IF instead of DBG_WARNING2 and don't pass UTF-16 for %s
    
    For lolz, I kept the useful German word "GrafikFehler" in the message, though.
    
    Change-Id: Ib714e27eef986cacfc979f132f1b2c29e603d9b0

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 4605abd..6a2efe7 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2280,10 +2280,7 @@ int GraphicFilter::LoadGraphic( const OUString &rPath, const OUString &rFilterNa
     else
         nRes = pFilter->ImportGraphic( rGraphic, rPath, *pStream, nFilter, pDeterminedFormat );
 
-#ifdef DBG_UTIL
-    if( nRes )
-        DBG_WARNING2( "GrafikFehler [%d] - [%s]", nRes, rPath.getStr() );
-#endif
+    SAL_WARN_IF( nRes, "vcl.filter", "GrafikFehler [" << nRes << "] - [" << rPath << "]" );
 
     return nRes;
 }


More information about the Libreoffice-commits mailing list