diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-04-01 00:17:46 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-04-01 08:06:58 +0000 |
| commit | 4c16651356614b66256d80fd89b8866543f53871 (patch) | |
| tree | b419e2738f2a0f3628d80d347b7034db6b3440f0 /framework/source/uiconfiguration | |
| parent | 884499a03ed125f8e87fd6ff620f3e0d2fef452c (diff) | |
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@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'framework/source/uiconfiguration')
| -rw-r--r-- | framework/source/uiconfiguration/ImageArrayData.cxx | 17 |
1 files changed, 2 insertions, 15 deletions
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 << "'"); } |