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

[Julien Nabet]

 framework/source/uiconfiguration/ImageArrayData.cxx |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 4c16651356614b66256d80fd89b8866543f53871
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Apr 1 00:17:46 2017 +0200

    Replace OSL_FAIL by SAL_WARN_IF
    
    + simplify message and code to create it
    
    Change-Id: I40cc0c1bf62a974ad5a5c5f27c4ed78c822390fa
    Reviewed-on: https://gerrit.libreoffice.org/35984
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/framework/source/uiconfiguration/ImageArrayData.cxx b/framework/source/uiconfiguration/ImageArrayData.cxx
index 6ebfc0928fdf..60316464f2b4 100644
--- a/framework/source/uiconfiguration/ImageArrayData.cxx
+++ b/framework/source/uiconfiguration/ImageArrayData.cxx
@@ -70,21 +70,8 @@ void ImageAryData::Load(const OUString &rPrefix)
 
     bool bSuccess = ImageTree::get().loadImage(aFileName, aIconTheme, maBitmapEx, true);
 
-    if (bSuccess)
-    {}
-#if OSL_DEBUG_LEVEL > 0
-    else
-    {
-        OStringBuffer aMessage;
-        aMessage.append( "ImageAryData::Load: failed to load image '" );
-        aMessage.append( OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
-        aMessage.append( "'" );
-        aMessage.append( " from icon theme '" );
-        aMessage.append( OUStringToOString( aIconTheme, RTL_TEXTENCODING_UTF8 ).getStr() );
-        aMessage.append( "'" );
-        OSL_FAIL( aMessage.makeStringAndClear().getStr() );
-    }
-#endif
+    SAL_WARN_IF(!bSuccess, "fwk.uiconfiguration", "Failed to load image '" << aFileName
+              << "' from icon theme '" << aIconTheme << "'");
 }