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

[Libreoffice Gerrit user]

 idl/source/prj/svidl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8cf0b56f1fbca36c86d499e5473c242041ba5183
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 22 16:30:03 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Oct 22 21:55:14 2018 +0200

    pvs-studio: V560 A part of conditional expression is always true
    
    Change-Id: Iff61dda72f304c335a1ac6d6b56e5fce2644ee81
    Reviewed-on: https://gerrit.libreoffice.org/62191
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 3926e47c2d43..d76b16a66835 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -161,9 +161,9 @@ int main ( int argc, char ** argv)
         bool bErr = false;
         bool bDoMove = aCommand.aTargetFile.isEmpty();
         OUString aErrFile, aErrFile2;
-        if( !bErr && !aCommand.aSlotMapFile.isEmpty() )
+        if (!aCommand.aSlotMapFile.isEmpty())
         {
-            bErr |= !FileMove_Impl( aCommand.aSlotMapFile, aTmpSlotMapFile, bDoMove );
+            bErr = !FileMove_Impl( aCommand.aSlotMapFile, aTmpSlotMapFile, bDoMove );
             if( bErr ) {
                 aErrFile = aCommand.aSlotMapFile;
                 aErrFile2 = aTmpSlotMapFile;