clang-tidy: readability-else-after-return

run it against sal,cppu,cppuhelper

I had to run this multiple times to catch all the cases in each module,
and it requires some hand-tweaking of the resulting output - clang-tidy
is not very good about cleaning up trailing spaces, and aligning
things nicely.

Change-Id: I00336345f5f036e12422b98d66526509380c497a
Reviewed-on: https://gerrit.libreoffice.org/36194
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 5 insertions, 14 deletions

diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 476198a0f69f..e8dcc574e58a 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -475,10 +475,7 @@ static Mapping getDirectMapping(
             aGuard.clear();
             return loadExternalMapping( rFrom, rTo, rAddPurpose );
         }
-        else
-        {
-            return Mapping( (*iFind).second->pMapping );
-        }
+        return Mapping( (*iFind).second->pMapping );
     }
     return Mapping();
 }
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index e7a6465b12e9..3fbe338cfc00 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -305,11 +305,8 @@ static inline bool idefaultConstructElements(
         OSL_ASSERT( nAlloc >= 0 ); // must have been an allocation failure
         return false;
     }
-    else
-    {
-        *ppSeq = pSeq;
-        return true;
-    }
+    *ppSeq = pSeq;
+    return true;
 }
 
 
@@ -568,11 +565,8 @@ static inline bool icopyConstructFromElements(
     {
         return false; // allocation failure
     }
-    else
-    {
-        *ppSeq = pSeq;
-        return true;
-    }
+    *ppSeq = pSeq;
+    return true;
 }