summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-05 21:37:37 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-05 22:16:57 +0200
commit570a719abf01e57d6f150c8f6fbe17d9110f9eb5 (patch)
tree76b0f41e4db63d04731a1cd09ef68506e48695cc
parent44202fed1fcb6b8d3523fd9e7bebf47f02fcd6d2 (diff)
Simplify SAL_WARN
Change-Id: I76c03d5e846fae6cba87be522a10d20e45528e4c
-rw-r--r--filter/source/config/cache/filtercache.cxx14
1 files changed, 4 insertions, 10 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 921baee92972..8517b71ee665 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -162,11 +162,7 @@ void FilterCache::takeOver(const FilterCache& rClone)
void FilterCache::load(EFillState eRequired,
-#if OSL_DEBUG_LEVEL > 1
sal_Bool bByThread
-#else
- sal_Bool
-#endif
)
throw(css::uno::Exception)
{
@@ -178,12 +174,10 @@ void FilterCache::load(EFillState eRequired,
if ((m_eFillState & eRequired) == eRequired)
return;
-#if OSL_DEBUG_LEVEL > 1
- if (!bByThread && ((eRequired & E_CONTAINS_ALL) == E_CONTAINS_ALL))
- {
- SAL_WARN( "filter.config", "Who disturb our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not really needed here!");
- }
-#endif
+ SAL_WARN_IF(
+ !bByThread && ((eRequired & E_CONTAINS_ALL) == E_CONTAINS_ALL),
+ "filter.config",
+ "Who disturb our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not really needed here!");
// Otherwise load the missing items.