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 /reportdesign | |
| 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 'reportdesign')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlControlProperty.cxx | 10 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/dlgedclip.cxx | 9 |
2 files changed, 3 insertions, 16 deletions
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index da9647fa54c5..9caa83916df8 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -198,9 +198,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_BOOLEAN: // sal_Bool { bool bValue(false); - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif ::sax::Converter::convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("OXMLControlProperty::convertString: could not convert \""). @@ -213,9 +211,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_LONG: // sal_Int32 { // it's a real int32/16 property sal_Int32 nValue(0); - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif ::sax::Converter::convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("OXMLControlProperty::convertString: could not convert \""). @@ -235,9 +231,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_DOUBLE: { double nValue = 0.0; - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("OXMLControlProperty::convertString: could not convert \""). @@ -266,10 +260,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe { // first extract the double double nValue = 0; - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif - ::sax::Converter::convertDouble(nValue, _rReadCharacters); + ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("OPropertyImport::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index 5923a5aa78e1..ed0484bc90d9 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -72,19 +72,14 @@ OReportExchange::TSectionElements OReportExchange::extractCopies(const Transfera { // extract the any from the transferable datatransfer::DataFlavor aFlavor; -#if OSL_DEBUG_LEVEL > 0 bool bSuccess = -#endif - SotExchange::GetFormatDataFlavor(nKnownFormatId, aFlavor); + SotExchange::GetFormatDataFlavor(nKnownFormatId, aFlavor); OSL_ENSURE(bSuccess, "OReportExchange::extractCopies: invalid data format (no flavor)!"); uno::Any aDescriptor = _rData.GetAny(aFlavor, OUString()); TSectionElements aCopies; -#if OSL_DEBUG_LEVEL > 0 - bSuccess = -#endif - aDescriptor >>= aCopies; + bSuccess = aDescriptor >>= aCopies; OSL_ENSURE(bSuccess, "OReportExchange::extractCopies: invalid clipboard format!"); // build the real descriptor |