mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some cppcheck cleaning

Browse Source 
Change-Id: I53ddb92d1fef3513536fa9a54bcedad35581f4aa
This commit is contained in:
Julien Nabet
2013-03-06 23:06:50 +01:00
parent 3c14d6545b
commit 0e2ad090d4
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sd/source/ui/remotecontrol/BluetoothServer.cxx
View File

@@ -663,7 +663,7 @@ void BluetoothServer::doRestoreDiscoverable()
void BluetoothServer::cleanupCommunicators() void BluetoothServer::cleanupCommunicators()
{ {
for (std::vector<Communicator *>::iterator it = mpCommunicators->begin(); for (std::vector<Communicator *>::iterator it = mpCommunicators->begin();
it != mpCommunicators->end(); it++) it != mpCommunicators->end(); ++it)
(*it)->forceClose(); (*it)->forceClose();
// the hope is that all the threads then terminate cleanly and // the hope is that all the threads then terminate cleanly and
// clean themselves up. // clean themselves up.

3
sw/source/ui/dbui/mailmergechildwindow.cxx
View File

@@ -515,14 +515,13 @@ void SwSendMailDialog::SendMails()
OSL_FAIL("config item not set"); OSL_FAIL("config item not set");
return; return;
} }
bool bIsLoggedIn = false;
EnterWait(); EnterWait();
//get a mail server connection //get a mail server connection
uno::Reference< mail::XSmtpService > xSmtpServer = uno::Reference< mail::XSmtpService > xSmtpServer =
SwMailMergeHelper::ConnectToSmtpServer( *m_pConfigItem, SwMailMergeHelper::ConnectToSmtpServer( *m_pConfigItem,
m_pImpl->xConnectedInMailService, m_pImpl->xConnectedInMailService,
aEmptyStr, aEmptyStr, this ); aEmptyStr, aEmptyStr, this );
bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected(); bool bIsLoggedIn = xSmtpServer.is() && xSmtpServer->isConnected();
LeaveWait(); LeaveWait();
if(!bIsLoggedIn) if(!bIsLoggedIn)
{ {