summaryrefslogtreecommitdiff
path: root/libreofficekit
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-05-23 10:44:07 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-05-27 11:01:17 +0200
commit05e4e065b04f1d0e120802f9f74d1017f16431c6 (patch)
treef4158f152b26d5c32120aba39790a848a59dc81b /libreofficekit
parentf9fcc569db6d55212f60ebc35416b7d0ec386ab8 (diff)
lokdocview: update doc size on LOK_CALLBACK_PAGE_COUNT_CHANGED
No need to do any actual rendering, the invalidation callback takes care of that. Change-Id: I9a3e45cab5250fc45eccb4577fe76377f76354eb (cherry picked from commit 490365b2452cb6fa96749475d996c6033b0d6407)
Diffstat (limited to 'libreofficekit')
-rw-r--r--libreofficekit/source/gtk/lokdocview.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 2cbd450a7f62..3203b4874b79 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -908,6 +908,8 @@ const char* LOKDocView_Impl::callbackTypeToString(int nType)
return "LOK_CALLBACK_STATUS_INDICATOR_FINISH";
case LOK_CALLBACK_SEARCH_NOT_FOUND:
return "LOK_CALLBACK_SEARCH_NOT_FOUND";
+ case LOK_CALLBACK_PAGE_COUNT_CHANGED:
+ return "LOK_CALLBACK_PAGE_COUNT_CHANGED";
}
return 0;
}
@@ -1002,6 +1004,11 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* pCallback)
break;
case LOK_CALLBACK_SEARCH_NOT_FOUND:
break;
+ case LOK_CALLBACK_PAGE_COUNT_CHANGED:
+ {
+ m_pDocument->pClass->getDocumentSize(m_pDocument, &m_nDocumentWidthTwips, &m_nDocumentHeightTwips);
+ }
+ break;
default:
g_assert(false);
break;
@@ -1025,7 +1032,7 @@ void LOKDocView_Impl::globalCallbackWorker(int nType, const char* pPayload, void
void LOKDocView_Impl::callbackWorkerImpl(int nType, const char* pPayload)
{
- LOKDocView_Impl::CallbackData* pCallback = new LOKDocView_Impl::CallbackData(nType, pPayload, m_pDocView);
+ LOKDocView_Impl::CallbackData* pCallback = new LOKDocView_Impl::CallbackData(nType, pPayload ? pPayload : "(nil)", m_pDocView);
g_info("lok_docview_callback_worker: %s, '%s'", LOKDocView_Impl::callbackTypeToString(nType), pPayload);
#if GTK_CHECK_VERSION(2,12,0)
gdk_threads_add_idle(LOKDocView_Impl::callback, pCallback);