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

2019-09-26 Thread Jan Holesovsky (via logerrit) 
 libreofficekit/source/gtk/lokdocview.cxx |   26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)

New commits:
commit 832ed2abb38d48d28b0b3deabfa6d8de799bdedb
Author: Jan Holesovsky 
AuthorDate: Tue Sep 24 17:00:41 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Sep 26 09:03:43 2019 +0200

gtktiledviewer: Turn an annoying assert into a compile-time check.

So that people don't forget adding the enum values here...

Change-Id: I0342e2ecca4d7d14641e44ca562b121182e8
Reviewed-on: https://gerrit.libreoffice.org/79548
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 033cc457e345..ea9147e3864f 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1068,7 +1068,7 @@ callback (gpointer pData)
 return G_SOURCE_REMOVE;
 }
 
-switch (pCallback->m_nType)
+switch (static_cast(pCallback->m_nType))
 {
 case LOK_CALLBACK_INVALIDATE_TILES:
 {
@@ -1257,11 +1257,6 @@ callback (gpointer pData)
 reportError(pDocView, pCallback->m_aPayload);
 }
 break;
-case LOK_CALLBACK_CONTEXT_MENU:
-{
-// TODO: Implement me
-break;
-}
 case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR:
 {
 std::stringstream aStream(pCallback->m_aPayload);
@@ -1356,13 +1351,26 @@ 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_STATUS_INDICATOR_START:
+case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE:
+case LOK_CALLBACK_STATUS_INDICATOR_FINISH:
+case LOK_CALLBACK_DOCUMENT_PASSWORD:
+case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY:
+case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
+case LOK_CALLBACK_SIGNATURE_STATUS:
+case LOK_CALLBACK_CONTEXT_MENU:
+case LOK_CALLBACK_PROFILE_FRAME:
 case LOK_CALLBACK_CLIPBOARD_CHANGED:
 case LOK_CALLBACK_CONTEXT_CHANGED:
-break; // TODO
-default:
-g_assert(false);
+case LOK_CALLBACK_CELL_SELECTION_AREA:
+case LOK_CALLBACK_CELL_AUTO_FILL_AREA:
+case LOK_CALLBACK_TABLE_SELECTED:
+{
+// TODO: Implement me
 break;
 }
+}
 delete pCallback;
 
 return G_SOURCE_REMOVE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-25 Thread Michael Meeks (via logerrit) 
 libreofficekit/source/gtk/lokdocview.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 53c507d694d39554f3c22a3101044f63093796b2
Author: Michael Meeks 
AuthorDate: Sat May 25 15:50:13 2019 +0100
Commit: Michael Meeks 
CommitDate: Sat May 25 15:50:42 2019 +0100

gtktiledviewer: Fix crash on copy.

Change-Id: I1afc6278f6853d5e45a305b4f731cb6af0e00cc1

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 0bf095e44360..1e08a42cf7cd 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1451,6 +1451,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:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-04-27 Thread Michael Meeks (via logerrit) 
 libreofficekit/source/gtk/lokdocview.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a85221127ca3d9b805a3abff490a5ed7d8b5cbe5
Author: Michael Meeks 
AuthorDate: Fri Apr 26 21:40:05 2019 +0100
Commit: Michael Meeks 
CommitDate: Sat Apr 27 18:52:11 2019 +0100

lok: handle missing callback.

Change-Id: I13a200c9c9d8b0a8fde6dd15a71fe1a665d04e8d

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 1dd109375481..eac27751eeb9 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1448,6 +1448,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;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-01-11 Thread Libreoffice Gerrit user 
 libreofficekit/source/gtk/lokdocview.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 945ff961ff549d9546476fbffcb98a99dbc5bdc7
Author: Jan Holesovsky 
AuthorDate: Wed Nov 14 15:36:30 2018 +0100
Commit: Miklos Vajna 
CommitDate: Fri Jan 11 17:06:59 2019 +0100

gtktiledviewer: Handle LOK_CALLBACK_SIGNATURE_STATUS to avoid an assert.

Change-Id: Iae56708d94a229911a5d008d519120ac59069cf3
Reviewed-on: https://gerrit.libreoffice.org/63391
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/66102
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 5f4238ae048f..c64e7cba0c69 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1028,6 +1028,11 @@ globalCallback (gpointer pData)
 reportError(pCallback->m_pDocView, pCallback->m_aPayload);
 }
 break;
+case LOK_CALLBACK_SIGNATURE_STATUS:
+{
+// TODO
+}
+break;
 default:
 g_assert(false);
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-01-11 Thread Libreoffice Gerrit user 
 libreofficekit/source/gtk/lokdocview.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 2fcdacd6e4724561d918216b6cbb1bf9d5128ee8
Author: Jan Holesovsky 
AuthorDate: Wed Nov 14 15:21:46 2018 +0100
Commit: Miklos Vajna 
CommitDate: Fri Jan 11 16:59:20 2019 +0100

gtktiledviewer: Compile-time check instead of an annoying assert.

Change-Id: Iece75f6f40bf7d7dfcde372cf9b4606adb9e34b2
Reviewed-on: https://gerrit.libreoffice.org/63390
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/66101
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 2db7674c5b34..5f4238ae048f 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -363,7 +363,7 @@ payloadToSize(const char* pPayload, long& rWidth, long& 
rHeight)
 static const char*
 callbackTypeToString (int nType)
 {
-switch (nType)
+switch (static_cast(nType))
 {
 case LOK_CALLBACK_INVALIDATE_TILES:
 return "LOK_CALLBACK_INVALIDATE_TILES";
@@ -439,6 +439,14 @@ callbackTypeToString (int nType)
 return "LOK_CALLBACK_RULER_UPDATE";
 case LOK_CALLBACK_WINDOW:
 return "LOK_CALLBACK_WINDOW";
+case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
+return "LOK_CALLBACK_VALIDITY_LIST_BUTTON";
+case LOK_CALLBACK_CLIPBOARD_CHANGED:
+return "LOK_CALLBACK_CLIPBOARD_CHANGED";
+case LOK_CALLBACK_CONTEXT_CHANGED:
+return "LOK_CALLBACK_CONTEXT_CHANGED";
+case LOK_CALLBACK_SIGNATURE_STATUS:
+return "LOK_CALLBACK_SIGNATURE_STATUS";
 }
 g_assert(false);
 return nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits