From cbce40e965acef51822b31d73da5fbc271fbcad0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann 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 --- svx/source/fmcomp/dbaobjectex.cxx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'svx/source/fmcomp/dbaobjectex.cxx') diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 38d4a1e0d4c3..04e7698bb3cd 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -121,20 +121,15 @@ namespace svx // extract the any from the transferable DataFlavor aFlavor; -#if OSL_DEBUG_LEVEL > 0 bool bSuccess = -#endif - SotExchange::GetFormatDataFlavor(getDescriptorFormatId(bForm), aFlavor); + SotExchange::GetFormatDataFlavor(getDescriptorFormatId(bForm), aFlavor); OSL_ENSURE(bSuccess, "OComponentTransferable::extractColumnDescriptor: invalid data format (no flavor)!"); Any aDescriptor = _rData.GetAny(aFlavor, OUString()); // extract the property value sequence Sequence< PropertyValue > aDescriptorProps; -#if OSL_DEBUG_LEVEL > 0 - bSuccess = -#endif - aDescriptor >>= aDescriptorProps; + bSuccess = aDescriptor >>= aDescriptorProps; OSL_ENSURE(bSuccess, "OComponentTransferable::extractColumnDescriptor: invalid clipboard format!"); // build the real descriptor -- cgit