[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sfx2/source

[Henry Castro (via logerrit)]

 sfx2/source/view/viewsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02063f5f500444761d46d4a405c17527fcff4c5b
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Dec 18 16:09:36 2019 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu May 21 00:34:59 2020 +0200

    lok: ensure assign one parent LOK notifier
    
    The frame window is unique that are parents of different view shells
    (windows)
    
    Change-Id: I0f5e76c0c0d9844c2bd642354ac93d368dc2af38
    Reviewed-on: https://gerrit.libreoffice.org/85426
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94507
    Tested-by: Henry Castro <hcastro at collabora.com>

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index e62a87b06b14..eee24a00d0ff 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1096,7 +1096,7 @@ SfxViewShell::SfxViewShell
     if (comphelper::LibreOfficeKit::isActive())
     {
         vcl::Window* pFrameWin = pViewFrame->GetWindow().GetFrameWindow();
-        if (pFrameWin)
+        if (pFrameWin && !pFrameWin->GetLOKNotifier())
             pFrameWin->SetLOKNotifier(this, true);
     }
 }