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

[Jochen Nitschke]

 reportdesign/source/filter/xml/xmlfilter.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2cd664b3d618e6085be8b44ee86eada6cd5f8789
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Sep 10 18:08:52 2017 +0200

    cppcheck: knownConditionTrueFalse 'bRet' is always false
    
    regression of commit 528632660b72b105345945c13c5b68060d94a91b
    Date:   Thu Feb 9 08:52:13 2017 +0200
        convert ErrCode to strong typedef
    
    Change-Id: I5ce2b7d38c8d71ec40cc8de7c13e8aec637476b7
    Reviewed-on: https://gerrit.libreoffice.org/42139
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 0398bb51fe91..219593595726 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -559,8 +559,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
         }
 
 
-        bRet = false;
-        nRet = ERRCODE_NONE;
+        bRet = nRet == ERRCODE_NONE;
 
         if ( bRet )
         {