[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Bjoern Michaelsen]

 sw/source/core/crsr/crsrsh.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 813faac457bb9bd76d826cfc2ae4bf61f6e583b4
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed May 27 11:40:28 2015 +0200

    tdf#91145: Set Cell Background Color in Table Broken in Writer 5.0
    
    - iterate over PaMs, not over Shells
    - regression from 0ed7c8b55a026d7d98f9c994ad5e8626dd9504b2
    
    Change-Id: I33ea486d416a7e64fd97938ce09492209c102c88

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 98dc7fd..9a027c1 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -909,12 +909,12 @@ void SwCrsrShell::ClearMark()
     // is there any GetMark?
     if( m_pTableCrsr )
     {
-        std::vector<SwViewShell*> vShells;
-        for(SwViewShell& rShell : GetRingContainer())
-            if(&rShell != this)
-                vShells.push_back(&rShell);
-        for(SwViewShell* pShell : vShells)
-            delete pShell;
+        std::vector<SwPaM*> vCrsrs;
+        for(auto& rCrsr : m_pCurCrsr->GetRingContainer())
+            if(&rCrsr != m_pCurCrsr)
+                vCrsrs.push_back(&rCrsr);
+        for(auto pCrsr : vCrsrs)
+            delete pCrsr;
         m_pTableCrsr->DeleteMark();
 
         m_pCurCrsr->DeleteMark();