summaryrefslogtreecommitdiff
path: root/cppu/source
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-04-27 19:57:17 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-04-27 20:59:34 +0200
commitba57c3e041bb05ef49a3ea7940a4183f09775a18 (patch)
tree04a00fcec685ccf0a85b4ba90b8f116794e85839 /cppu/source
parent3ffb0373695a7b3a7f8cab8f2b8bf259c4300a7e (diff)
tdf#120703 PVS: V581 ifs with identical conditions
V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Change-Id: I79c655a072faff0bdb2af031ed1328e684b83aac Reviewed-on: https://gerrit.libreoffice.org/71430 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'cppu/source')
-rw-r--r--cppu/source/uno/lbmap.cxx19
1 files changed, 8 insertions, 11 deletions
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index fc093907c591..6979c74042f9 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -603,21 +603,18 @@ void SAL_CALL uno_getMapping(
if (*ppMapping)
return;
- }
- if (! aRet.is()) // try callback chain
- {
- MutexGuard aGuard( rData.aCallbacksMutex );
- for ( const auto& rCallback : rData.aCallbacks )
+ // try callback chain
{
- (*rCallback)( ppMapping, pFrom, pTo, aAddPurpose.pData );
- if (*ppMapping)
- return;
+ MutexGuard aGuard(rData.aCallbacksMutex);
+ for (const auto& rCallback : rData.aCallbacks)
+ {
+ (*rCallback)(ppMapping, pFrom, pTo, aAddPurpose.pData);
+ if (*ppMapping)
+ return;
+ }
}
- }
- if (! aRet.is())
- {
aRet = loadExternalMapping( aFrom, aTo, aAddPurpose ); // direct try
if (! aRet.is())
aRet = getMediateMapping( aFrom, aTo, aAddPurpose ); // try via uno