[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source

Caolán McNamara caolanm at redhat.com
Tue Mar 13 19:57:59 UTC 2018


 sw/source/core/crsr/crstrvl.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e4c16d917d7cb4c7c220e9e51cd8c4a386317305
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 12 14:29:48 2018 +0000

    tdf#107094 backward heading search doesn't always work
    
    regression from...
    
    commit 84e44386d70e886f9bae633ebe915ea3a52f8dbd
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Wed Nov 12 10:35:18 2014 +0000
    
        coverity#982189 Unchecked return value
    
    so put it back the way it was and explicitly ignore the return
    instead
    
        Change-Id: I6f5ef42b38236ea5f70ddbccfa25a81f2f3e976c
    
    Change-Id: I0c0084247e8570ace2198fa893db273dab00d2b0
    Reviewed-on: https://gerrit.libreoffice.org/51148
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 0dd9819023a5..fba4d61de3a3 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -981,8 +981,9 @@ bool SwCursorShell::GotoPrevOutline()
 
     SwNode* pNd = &(pCursor->GetNode());
     SwOutlineNodes::size_type nPos;
-    bool bRet = rNds.GetOutLineNds().Seek_Entry(pNd, &nPos);
-    if (bRet && nPos)
+    bool bRet = false;
+    (void)rNds.GetOutLineNds().Seek_Entry(pNd, &nPos);
+    if (nPos)
     {
         --nPos; // before
 


More information about the Libreoffice-commits mailing list