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

Julien Nabet serval2412 at yahoo.fr
Wed Mar 6 14:09:29 PST 2013


 sd/source/ui/remotecontrol/BluetoothServer.cxx |    2 +-
 sw/source/ui/dbui/mailmergechildwindow.cxx     |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0e2ad090d4b3147a58ea2f331d7a7d8a92b74bcf
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Mar 6 23:06:50 2013 +0100

    Some cppcheck cleaning
    
    Change-Id: I53ddb92d1fef3513536fa9a54bcedad35581f4aa

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index fa919ab..a874a6a 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -663,7 +663,7 @@ void BluetoothServer::doRestoreDiscoverable()
 void BluetoothServer::cleanupCommunicators()
 {
     for (std::vector<Communicator *>::iterator it = mpCommunicators->begin();
-         it != mpCommunicators->end(); it++)
+         it != mpCommunicators->end(); ++it)
         (*it)->forceClose();
     // the hope is that all the threads then terminate cleanly and
     // clean themselves up.
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index de02632..95b494a 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -515,14 +515,13 @@ void  SwSendMailDialog::SendMails()
         OSL_FAIL("config item not set");
         return;
     }
-    bool bIsLoggedIn = false;
     EnterWait();
     //get a mail server connection
     uno::Reference< mail::XSmtpService > xSmtpServer =
                 SwMailMergeHelper::ConnectToSmtpServer( *m_pConfigItem,
                                             m_pImpl->xConnectedInMailService,
                                             aEmptyStr, aEmptyStr, this );
-    bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected();
+    bool bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected();
     LeaveWait();
     if(!bIsLoggedIn)
     {


More information about the Libreoffice-commits mailing list