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

[Mike Kaganski]

 sw/source/uibase/dbui/dbmgr.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cd718dcdd2261b06f6f1bfa8be2a37c365304c1c
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Tue Jul 3 11:37:46 2018 +0200

    Small cleanup of redundant assert expressions
    
    Change-Id: Ia529a6a9cf0ce75c612b8fc0fa1bc7dc8f1c2b5a
    Reviewed-on: https://gerrit.libreoffice.org/56853
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 4e1b4c1b7909..8b045595d2c3 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1156,13 +1156,13 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
     if( bMT_EMAIL )
     {
         assert( !rMergeDescriptor.bPrefixIsFilename );
-        assert( bMT_EMAIL && !bCheckSingleFile_ );
+        assert(!bCheckSingleFile_);
         bCheckSingleFile_ = false;
     }
     else if( bMT_SHELL || bMT_PRINTER )
     {
         assert( !rMergeDescriptor.bPrefixIsFilename );
-        assert( (bMT_SHELL || bMT_PRINTER) && bCheckSingleFile_ );
+        assert(bCheckSingleFile_);
         bCheckSingleFile_ = true;
     }
     const bool bCreateSingleFile = bCheckSingleFile_;