do not use manual iteration

Change-Id: Id2aaa4171680d8d002d4b2aebf6281ca817c74d9

do not use manual iteration
Change-Id: Id2aaa4171680d8d002d4b2aebf6281ca817c74d9
16e524d5 · Bjoern Michaelsen · 35f70c86 · 16e524d5
Kaydet (Commit) 16e524d5 authored Ock 23, 2015 tarafından Bjoern Michaelsen
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

newfrm.cxx sw/source/core/layout/newfrm.cxx +11 -1

No files found.
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -415,7 +415,17 @@ void SwRootFrm::DeRegisterShell( SwViewShell *pSh )
 {
    // Activate some shell if possible
    if ( pCurrShell == pSh )
-        pCurrShell = pSh->GetNext() != pSh ? pSh->GetNext() : nullptr;
+    {
+        pCurrShell = nullptr;
+        for(SwViewShell& rShell : pSh->GetRingContainer())
+        {
+            if(&rShell != pSh)
+            {
+                pCurrShell = &rShell;
+                break;
+            }
+        }
+    }

    // Doesn't matter anymore
    if ( pWaitingCurrShell == pSh )