From cbce40e965acef51822b31d73da5fbc271fbcad0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 9 Jul 2015 08:50:37 +0200
Subject: 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
---
 svl/source/items/poolitem.cxx | 6 +-----
 svl/source/misc/urihelper.cxx | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'svl')

diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index d5bcc71cc4cf..ef6c7fe61ba3 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -218,11 +218,7 @@ SfxVoidItem::SfxVoidItem( const SfxVoidItem& rCopy):
 }
 
 
-bool SfxVoidItem::operator==( const SfxPoolItem&
-#ifdef DBG_UTIL
-rCmp
-#endif
-) const
+bool SfxVoidItem::operator==( const SfxPoolItem& rCmp ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==( rCmp ), "unequal type" );
     return true;
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 25ba86dd40f2..3199e420a3de 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -140,9 +140,7 @@ Result normalizePrefix( css::uno::Reference< css::ucb::XUniversalContentBroker >
         return GeneralFailure;
     }
     try {
-        #if OSL_DEBUG_LEVEL > 0
         bool ok =
-        #endif
             (css::uno::Reference< css::ucb::XCommandProcessor >(
                    content, css::uno::UNO_QUERY_THROW)->execute(
                        css::ucb::Command("getCasePreservingURL",
-- 
cgit