diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-10-18 14:32:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-19 16:04:00 +0100 |
| commit | 5e8c0dd410942807481a75a29805db40b8659a4e (patch) | |
| tree | 43131aefaac4b1732489f5251f6f762420ff43dd /filter | |
| parent | 7b000922d034c3002c8a56a705cf7f8e902f4c92 (diff) | |
don't annoy me in the en-US fallback case
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/config/cache/filtercache.cxx | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 5099cc9e7fe1..9d0a8855601e 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1691,18 +1691,20 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe pLocale = ::comphelper::Locale::getFallback(lLocales, sActLocale); if (pLocale == lLocales.end()) { - #if OSL_DEBUG_LEVEL > 0 - ::rtl::OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, ::rtl::OUString()); - - ::rtl::OUStringBuffer sMsg(256); - sMsg.appendAscii("Fallback scenario for filter or type '" ); - sMsg.append (sName ); - sMsg.appendAscii("' and locale '" ); - sMsg.append (sActLocale ); - sMsg.appendAscii("' failed. Please check your filter configuration."); - - OSL_FAIL(_FILTER_CONFIG_TO_ASCII_(sMsg.makeStringAndClear())); - #endif +#if OSL_DEBUG_LEVEL > 0 + if (sActLocale.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("en-US"))) + return; + ::rtl::OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, ::rtl::OUString()); + + ::rtl::OUStringBuffer sMsg(256); + sMsg.appendAscii("Fallback scenario for filter or type '" ); + sMsg.append (sName ); + sMsg.appendAscii("' and locale '" ); + sMsg.append (sActLocale ); + sMsg.appendAscii("' failed. Please check your filter configuration."); + + OSL_FAIL(_FILTER_CONFIG_TO_ASCII_(sMsg.makeStringAndClear())); +#endif return; } |