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

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 85d959092ce9114941bba9d1cb49335e711677d1
Author:     Zdibák Zoltán <zdibakzoltan at gmail.com>
AuthorDate: Sat Nov 10 22:05:34 2018 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Nov 11 09:19:23 2018 +0100

    cppCheck redundantAssignment variable bSuccess
    
    Change-Id: Ifacc27284201f74da7b4693a74d40e83ffc66408
    Reviewed-on: https://gerrit.libreoffice.org/63251
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 450cd0f1ad78..676afca7923f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4365,7 +4365,6 @@ static void lo_destroy(LibreOfficeKit* pThis)
 {
     SolarMutexClearableGuard aGuard;
 
-    bool bSuccess = false;
     LibLibreOffice_Impl* pLib = static_cast<LibLibreOffice_Impl*>(pThis);
     gImpl = nullptr;
 
@@ -4375,7 +4374,7 @@ static void lo_destroy(LibreOfficeKit* pThis)
     uno::Reference <frame::XDesktop2> xDesktop = frame::Desktop::create ( ::comphelper::getProcessComponentContext() );
     // FIXME: the terminate() call here is a no-op because it detects
     // that LibreOfficeKit::isActive() and then returns early!
-    bSuccess = xDesktop.is() && xDesktop->terminate();
+    bool bSuccess = xDesktop.is() && xDesktop->terminate();
 
     if (!bSuccess)
     {