diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-09 08:50:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-13 18:14:11 +0200 |
| commit | cbce40e965acef51822b31d73da5fbc271fbcad0 (patch) | |
| tree | bad77c67c68055f7597b8ecf1df1b74e778873cf /filter | |
| parent | 429280541ff1fbbbf3f0482211a659c96c3347d2 (diff) | |
Make content of OSL_ASSERT, DBG_ASSERT, etc. visiblie in non-debug builds
...to avoid lots of loplugin:staticmethods warnings. Also enables DBG_ASSERT
etc. also for --enable-debug builds in addition to --enable-dbgutil builds.
Change-Id: Ib89ecd9ab8ce7abb2c64790ace248b31f9d2b64d
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/config/cache/filtercache.cxx | 2 | ||||
| -rw-r--r-- | filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 8 | ||||
| -rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 4 |
3 files changed, 2 insertions, 12 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index a44e8d5086b8..0fb0173a3534 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1253,7 +1253,9 @@ void FilterCache::impl_validateAndOptimize() "filter configuration: " + sLogOut, css::uno::Reference< css::uno::XInterface >(), sLogOut); +#if OSL_DEBUG_LEVEL > 0 OSL_ENSURE(!nWarnings, OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); +#endif // <- SAFE } diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 7aee58480d35..afd728eb411a 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -168,11 +168,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::be return false; } } -#if OSL_DEBUG_LEVEL > 0 catch( const Exception& e ) -#else - catch( const Exception& ) -#endif { if (xStatusIndicator.is()) xStatusIndicator->end(); @@ -290,11 +286,7 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star::be return false; } } -#if OSL_DEBUG_LEVEL > 0 catch( const Exception& exE ) -#else - catch( const Exception& ) -#endif { OSL_FAIL( OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); if (xStatusIndicator.is()) diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 09b66fbc2d5c..82d1d7dc9d4a 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -402,11 +402,7 @@ namespace XSLT m_tcontrol->terminate(); return !m_bError; } -#if OSL_DEBUG_LEVEL > 0 catch( const Exception& exc) -#else - catch (const Exception&) -#endif { // something went wrong OSL_FAIL(OUStringToOString(exc.Message, RTL_TEXTENCODING_ASCII_US).getStr()); |