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 /extensions/source/abpilot | |
| 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 'extensions/source/abpilot')
| -rw-r--r-- | extensions/source/abpilot/fieldmappingimpl.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 6c99566b86fc..5c5be725ffba 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -91,10 +91,8 @@ namespace abp Reference< XPropertySet > xDialogProps( xDialog, UNO_QUERY ); Sequence< AliasProgrammaticPair > aMapping; -#ifdef DBG_UTIL bool bSuccess = -#endif - xDialogProps->getPropertyValue("FieldMapping") >>= aMapping; + xDialogProps->getPropertyValue("FieldMapping") >>= aMapping; DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" ); // and copy it into the map @@ -235,10 +233,10 @@ namespace abp #ifdef DBG_UTIL OUString sRedundantProgrammaticName; aFields.openNode( *pExistentFields ).getNodeValue( sProgrammaticNodeName ) >>= sRedundantProgrammaticName; -#endif DBG_ASSERT( sRedundantProgrammaticName == *pExistentFields, "fieldmapping::writeTemplateAddressFieldMapping: inconsistent config data!" ); // there should be a redundancy in the config data .... if this asserts, there isn't anymore! +#endif // do we have a new alias for the programmatic? MapString2String::iterator aPos = aFieldAssignment.find( *pExistentFields ); |