From 5edb280c093842d9d131f9cb7b404403d605a4dc Mon Sep 17 00:00:00 2001

From: Miklos Vajna <vmiklos@collabora.co.uk>

Date: Thu, 17 Sep 2015 09:30:09 +0200

Subject: [PATCH 146/398] SfxLokHelper::setView: check if view is already

 current

Change-Id: I9cf3a4887774657e0e205114688b088fc11c6822

(cherry picked from commit 714257af17f74f8bcb5acceaebb0d0f4b3be3231)

---

 sfx2/source/view/lokhelper.cxx | 3 +++

 1 file changed, 3 insertions(+)

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx

index 646715ef226f..f3731e799ec3 100644

--- a/sfx2/source/view/lokhelper.cxx

+++ b/sfx2/source/view/lokhelper.cxx

@@ -45,6 +45,9 @@ void SfxLokHelper::setView(size_t nId)

         return;

     SfxViewShell* pViewShell = rViewArr[nId];

+    if (pViewShell->GetViewFrame() == SfxViewFrame::Current())

+        return;

+

     if (SfxViewFrame* pViewFrame = pViewShell->GetViewFrame())

         pViewFrame->MakeActive_Impl(false);

 }

-- 

2.12.0