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

[Julien Nabet]

 sd/source/ui/remotecontrol/Server.cxx                   |    2 +-
 sw/source/core/doc/DocumentContentOperationsManager.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f8f0327e0fa69e7c6b03117dd6e39f4da2030434
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Feb 22 22:56:19 2015 +0100

    Simplify erase iterator management (DocumentContentOperationsManager.cxx)
    
    Change-Id: Ib9f71832ad12449a73ae803bf7219c2e1c93f086

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 99366fb..9c1f701 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3382,7 +3382,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
                 pSNd->GetIndex() < rStartIdx.GetIndex() &&
                 rStartIdx.GetIndex() < pSNd->EndOfSectionIndex() )
             {
-                aSet.erase (it++);
+                it = aSet.erase(it);
                 continue;
             }
         }
commit de8d6e8f377b5d478cc62036448a75c00c1b9afc
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Feb 22 22:55:36 2015 +0100

    Indent
    
    Change-Id: Iabdb9864d7e0e4740331aead895332ec027a82f5

diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 75d5e2e..06093bb 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -327,7 +327,7 @@ bool RemoteServer::connectClient( ::boost::shared_ptr< ClientInfo > pClient, con
             if ( pClient == *aIt )
             {
                 spServer->mAvailableClients.erase( aIt );
-            break;
+                break;
             }
         }
         pCommunicator->launch();