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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Sep 3 06:34:16 UTC 2018


 sc/source/ui/docshell/dbdocimp.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 9e28155909a5d3295e2a531731790a42fdb4c8a2
Author:     Jochen Nitschke <j.nitschke+logerrit at ok.de>
AuthorDate: Sun Sep 2 11:38:22 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Sep 3 08:33:56 2018 +0200

    cppcheck: knownConditionTrueFalse
    
    Change-Id: I6ee2dd049b2482d93b5d05754c11b34bf535e377
    Reviewed-on: https://gerrit.libreoffice.org/59907
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index df9b96129c2f..49c1cf8d542b 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -140,7 +140,6 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
     ScDocShellModificator aModificator( rDocShell );
 
     bool bSuccess = false;
-    bool bApi = false;                      //! pass as argument
     bool bTruncated = false;                // for warning
     const char* pErrStringId = nullptr;
     OUString aErrorMessage;
@@ -602,10 +601,10 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         if (pWaitWin)
             pWaitWin->LeaveWait();
 
-        if ( bTruncated && !bApi )          // show warning
+        if ( bTruncated )          // show warning
             ErrorHandler::HandleError(SCWARN_IMPORT_RANGE_OVERFLOW);
     }
-    else if ( !bApi )
+    else
     {
         if (pWaitWin)
             pWaitWin->LeaveWait();


More information about the Libreoffice-commits mailing list