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

[Tamás Zolnai (via logerrit)]

 sw/source/core/crsr/bookmrk.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5117dc8d657729e36e363c7adc9b60a895509437
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Oct 26 14:36:44 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Oct 26 16:54:14 2020 +0100

    lok: Send form field events to the correct view.
    
    Change-Id: I00b40052774602eccd8e4a7d460cedcb36bbd0d2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104812
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index e12cd66dadc1..097e2dea6bd2 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -671,7 +671,7 @@ namespace sw { namespace mark
     void DropDownFieldmark::SendLOKMessage(const OString& sAction)
     {
         const SfxViewShell* pViewShell = SfxViewShell::Current();
-        if (pViewShell && pViewShell->isLOKMobilePhone())
+        if (!pViewShell || pViewShell->isLOKMobilePhone())
         {
               return;
         }
@@ -729,7 +729,7 @@ namespace sw { namespace mark
             }
             if (sPayload.toString() != m_sLastSentLOKMsg) {
                 m_sLastSentLOKMsg = sPayload.toString();
-                pEditWin->GetView().GetWrtShell().GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_FORM_FIELD_BUTTON, m_sLastSentLOKMsg.getStr());
+                pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_FORM_FIELD_BUTTON, m_sLastSentLOKMsg.getStr());
             }
         }
     }