From c3cc574235c7db2214c26860554c725ff3976161 Mon Sep 17 00:00:00 2001
From: Matteo Casalin <matteo.casalin@yahoo.com>
Date: Thu, 17 Sep 2015 07:59:00 +0200
Subject: Simplify by early bail-out

Change-Id: I9210db5196e5c40f450e8bedac2ddd9bd2299f9c
---
 sc/source/ui/dbgui/csvsplits.cxx | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx
index 11ed0bae12a7..aaa0952d6b7b 100644
--- a/sc/source/ui/dbgui/csvsplits.cxx
+++ b/sc/source/ui/dbgui/csvsplits.cxx
@@ -23,24 +23,26 @@
 
 bool ScCsvSplits::Insert( sal_Int32 nPos )
 {
-    bool bValid = (nPos >= 0);
-    if( bValid )
-    {
-        iterator aIter = ::std::lower_bound( maVec.begin(), maVec.end(), nPos );
-        bValid = (aIter == maVec.end()) || (*aIter != nPos);
-        if( bValid )
-            aIter = maVec.insert( aIter, nPos );
-    }
-    return bValid;
+    if (nPos < 0)
+        return false;
+
+    const iterator aIter = ::std::lower_bound( maVec.begin(), maVec.end(), nPos );
+
+    if (aIter != maVec.end() && *aIter == nPos)
+        return false;
+
+    maVec.insert( aIter, nPos );
+    return true;
 }
 
 bool ScCsvSplits::Remove( sal_Int32 nPos )
 {
     sal_uInt32 nIndex = GetIndex( nPos );
-    bool bValid = (nIndex != CSV_VEC_NOTFOUND);
-    if( bValid )
-        maVec.erase( maVec.begin() + nIndex );
-    return bValid;
+    if (nIndex == CSV_VEC_NOTFOUND)
+        return false;
+
+    maVec.erase( maVec.begin() + nIndex );
+    return true;
 }
 
 void ScCsvSplits::RemoveRange( sal_Int32 nPosStart, sal_Int32 nPosEnd )
-- 
cgit