do not use manual iteration

Change-Id: I1911b1dec2acd89c104c2b226fb212b7deb40c3b

1 files changed, 13 insertions, 3 deletions

diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 31d0de4028dc..6a951a10c068 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -360,9 +360,19 @@ SwViewShell::~SwViewShell()
     if ( mpDoc )
     {
         GetLayout()->DeRegisterShell( this );
-        if(mpDoc->getIDocumentLayoutAccess().GetCurrentViewShell()==this)
-            mpDoc->getIDocumentLayoutAccess().SetCurrentViewShell( this->GetNext()!=this ?
-            this->GetNext() : nullptr );
+        auto& rLayoutAccess(mpDoc->getIDocumentLayoutAccess());
+        if(rLayoutAccess.GetCurrentViewShell()==this)
+        {
+            rLayoutAccess.SetCurrentViewShell(nullptr);
+            for(SwViewShell& rShell : GetRingContainer())
+            {
+                if(&rShell != this)
+                {
+                    rLayoutAccess.SetCurrentViewShell(&rShell);
+                    break;
+                }
+            }
+        }
     }
 
     delete mpTmpRef;