summaryrefslogtreecommitdiffstats
path: root/filter/source/config/cache/filtercache.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-05-26 10:58:42 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-05-28 19:44:08 +0200
commitef513fd4b049b214a03fbe6e62a5ea43680a7a9b (patch)
tree82f2ce93bc8e5fde6dce8685b633c3d643c9f069 /filter/source/config/cache/filtercache.cxx
parentrdm#2247 enable Upper Sorbian for languagepack/UI (diff)
downloadcore-ef513fd4b049b214a03fbe6e62a5ea43680a7a9b.tar.gz
core-ef513fd4b049b214a03fbe6e62a5ea43680a7a9b.zip
remove unnecessary use of OString::getStr
Change-Id: I0490efedf459190521f4339854b3394d57765fdb Reviewed-on: https://gerrit.libreoffice.org/38058 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter/source/config/cache/filtercache.cxx')
-rw-r--r--filter/source/config/cache/filtercache.cxx17
1 files changed, 5 insertions, 12 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 3d836d9fdb2b..cfc5ad0e5513 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -820,7 +820,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
}
{
- SAL_INFO( "filter.config", "" << sRtlLog.getStr());
+ SAL_INFO( "filter.config", "" << sRtlLog);
*pConfig = impl_createConfigAccess(sPath ,
false, // bReadOnly
true ); // bLocalesMode
@@ -878,15 +878,10 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const OUString& sDirectKey)
}
catch(const css::uno::RuntimeException&)
{ throw; }
- #if OSL_DEBUG_LEVEL > 0
catch(const css::uno::Exception& ex)
- #else
- catch(const css::uno::Exception&)
- #endif
{
- #if OSL_DEBUG_LEVEL > 0
- OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr());
- #endif
+ (void)ex;
+ SAL_WARN( "filter.config", ex.Message);
aValue.clear();
}
@@ -1537,10 +1532,8 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
return;
OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, OUString());
- OUString sMsg("Fallback scenario for filter or type '" + sName + "' and locale '" +
- sActLocale + "' failed. Please check your filter configuration.");
-
- OSL_FAIL(FILTER_CONFIG_TO_ASCII_(sMsg));
+ SAL_WARN("filter.config", "Fallback scenario for filter or type '" << sName << "' and locale '" <<
+ sActLocale << "' failed. Please check your filter configuration.");
#endif
return;
}