[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - libreofficekit/source

[Michael Meeks (via logerrit)]

 libreofficekit/source/gtk/lokdocview.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cb5334fe00a9dcf543b3eca35e5e2b4c4882304f
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat May 25 15:50:13 2019 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Mon Sep 9 04:57:12 2019 +0200

    gtktiledviewer: Fix crash on copy.
    
    Change-Id: I1afc6278f6853d5e45a305b4f731cb6af0e00cc1
    Reviewed-on: https://gerrit.libreoffice.org/72955
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 20dbfaedc0147e6276f4b41cf9b4fb6af2ee71f0)

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 1f7d4a0666a0..06e6dd0bf1d5 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1354,6 +1354,7 @@ callback (gpointer pData)
     case LOK_CALLBACK_INVALIDATE_HEADER:
         g_signal_emit(pCallback->m_pDocView, doc_view_signals[INVALIDATE_HEADER], 0, pCallback->m_aPayload.c_str());
         break;
+    case LOK_CALLBACK_CLIPBOARD_CHANGED:
     case LOK_CALLBACK_CONTEXT_CHANGED:
         break; // TODO
     default:
commit 2fea258f1886ac735fc4da3a6ea3ebf64458bb84
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Apr 26 21:40:05 2019 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Mon Sep 9 04:56:43 2019 +0200

    lok: handle missing callback.
    
    Change-Id: I13a200c9c9d8b0a8fde6dd15a71fe1a665d04e8d
    Reviewed-on: https://gerrit.libreoffice.org/71432
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 85dc12a99b455126e8deae5637bf63c48ce8938e)

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index ed2141c5ff66..1f7d4a0666a0 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1354,6 +1354,8 @@ callback (gpointer pData)
     case LOK_CALLBACK_INVALIDATE_HEADER:
         g_signal_emit(pCallback->m_pDocView, doc_view_signals[INVALIDATE_HEADER], 0, pCallback->m_aPayload.c_str());
         break;
+    case LOK_CALLBACK_CONTEXT_CHANGED:
+        break; // TODO
     default:
         g_assert(false);
         break;