[Libreoffice-commits] core.git: svx/source

[Libreoffice Gerrit user]

 svx/source/accessibility/ChildrenManagerImpl.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7b6f9b6db7eab2c95b010f542a237dce5350ee73
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 22 15:36:33 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 22 21:58:25 2018 +0100

    coverity#1441483 try and silence bogus Using invalid iterator
    
    Change-Id: I312cef93a0cef48207a3b7f5165dd48d702de3c6
    Reviewed-on: https://gerrit.libreoffice.org/63810
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 0485b35d24ab..928438bd6ff2 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -737,8 +737,7 @@ bool ChildrenManagerImpl::ReplaceChild (
     auto I = std::find_if(maVisibleChildren.begin(), maVisibleChildren.end(),
         [&pCurrentChild](const ChildDescriptor& rChild) { return rChild.GetAccessibleShape() == pCurrentChild; });
 
-    bool bResult = I != maVisibleChildren.end();
-    if (bResult)
+    if (I != maVisibleChildren.end())
     {
         // Dispose the current child and send an event about its deletion.
         pCurrentChild->dispose();
@@ -754,12 +753,13 @@ bool ChildrenManagerImpl::ReplaceChild (
             AccessibleEventId::CHILD,
             uno::makeAny (I->mxAccessibleShape),
             uno::Any());
+
+        return true;
     }
 
     // When not found among the visible children we have to search the list
     // of accessible shapes.  This is not yet implemented.
-
-    return bResult;
+    return false;
 }
 
 // Add the impl method for IAccessibleParent interface