[Libreoffice-commits] core.git: sw/source

[Tamás Zolnai (via logerrit)]

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

New commits:
commit 7988adf2bd250a32885d67306c73e07caa910778
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 17:56:42 2020 +0100

    lok: Send form field events to the correct view.
    
    Change-Id: I00b40052774602eccd8e4a7d460cedcb36bbd0d2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104811
    Tested-by: Jenkins
    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 fd339f583ee1..f1271c692c21 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -708,7 +708,7 @@ namespace sw::mark
     void DropDownFieldmark::SendLOKMessage(const OString& sAction)
     {
         const SfxViewShell* pViewShell = SfxViewShell::Current();
-        if (pViewShell && pViewShell->isLOKMobilePhone())
+        if (!pViewShell || pViewShell->isLOKMobilePhone())
         {
               return;
         }
@@ -766,7 +766,7 @@ namespace sw::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());
         }
     }