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 /xmloff/source/forms/propertyimport.cxx | |
| 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 'xmloff/source/forms/propertyimport.cxx')
| -rw-r--r-- | xmloff/source/forms/propertyimport.cxx | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 178104844698..d40003387a58 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -93,10 +93,8 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe case TypeClass_BOOLEAN: // sal_Bool { bool bValue; - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif - ::sax::Converter::convertBool(bValue, _rReadCharacters); + ::sax::Converter::convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("PropertyConversion::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). @@ -109,10 +107,8 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe if (!_pEnumMap) { // it's a real int32/16 property sal_Int32 nValue(0); - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif - ::sax::Converter::convertNumber(nValue, _rReadCharacters); + ::sax::Converter::convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("PropertyConversion::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). @@ -149,10 +145,8 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe case TypeClass_DOUBLE: { double nValue; - #if OSL_DEBUG_LEVEL > 0 bool bSuccess = - #endif - ::sax::Converter::convertDouble(nValue, _rReadCharacters); + ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, OStringBuffer("PropertyConversion::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). @@ -177,10 +171,8 @@ Any PropertyConversion::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("PropertyConversion::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). @@ -315,11 +307,7 @@ bool OPropertyImport::encounteredAttribute(const OUString& _rAttributeName) cons return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(_rAttributeName); } -void OPropertyImport::Characters(const OUString& -#if OSL_DEBUG_LEVEL > 0 -_rChars -#endif -) +void OPropertyImport::Characters(const OUString& _rChars ) { // ignore them (should be whitespaces only) OSL_ENSURE(_rChars.trim().isEmpty(), "OPropertyImport::Characters: non-whitespace characters!"); |