summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-02-11 15:55:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-02-11 16:06:03 +0100
commitd6eaa8d863f5bc352ce6a06c910dc3a0fd0216f7 (patch)
treedff6d7f9cadfc091e31d8d9cdf67a23473ec56e9
parente20316ede6978d0ace077c3f3dd5c22fea54b5dc (diff)
Work around loplugin:oncevar with --disable-dbgutil
Change-Id: I8f2a2910993609dec91e63074a5b9195a2352bb5
-rw-r--r--extensions/source/abpilot/fieldmappingimpl.cxx12
-rw-r--r--include/sal/log-areas.dox1
2 files changed, 7 insertions, 6 deletions
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 4d7b07c8562a..921a126560c0 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -229,13 +229,13 @@ namespace abp
for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields )
{
-#ifdef DBG_UTIL
- OUString sRedundantProgrammaticName;
- aFields.openNode( *pExistentFields ).getNodeValue( sProgrammaticNodeName ) >>= sRedundantProgrammaticName;
- DBG_ASSERT( sRedundantProgrammaticName == *pExistentFields,
- "fieldmapping::writeTemplateAddressFieldMapping: inconsistent config data!" );
+ SAL_WARN_IF(
+ ((aFields.openNode(*pExistentFields)
+ .getNodeValue(sProgrammaticNodeName).get<OUString>())
+ != *pExistentFields),
+ "extensions.abpilot",
+ "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 );
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d6251fc52494..b4b3184d97b2 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -174,6 +174,7 @@ certain functionality.
@section extensions
+@li @c extensions.abpilot
@li @c extensions.biblio
@li @c extensions.dbpilots
@li @c extensions.plugin