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

[Miklos Vajna]

 libreofficekit/source/gtk/lokdocview.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 127a34ef2cf9fe0ac13a273c12c6d45ef57eaf49
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Aug 31 11:38:41 2016 +0200

    lokdocview: handle empty LOK_CALLBACK_DOCUMENT_SIZE_CHANGED payload
    
    Calc omits the document size in the payload in several cases, and
    online.git handles that, so handle it in lokdocview as well for now,
    instead of fixing up all the sc code to always emit the doc size in the
    payload.
    
    Change-Id: Ib2cca1770d2a160e32540e3a3158eb00bf13207b

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index fc8d3637..0699322 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1228,7 +1228,11 @@ callback (gpointer pData)
     break;
     case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
     {
-        payloadToSize(pCallback->m_aPayload.c_str(), priv->m_nDocumentWidthTwips, priv->m_nDocumentHeightTwips);
+        if (!pCallback->m_aPayload.empty())
+            payloadToSize(pCallback->m_aPayload.c_str(), priv->m_nDocumentWidthTwips, priv->m_nDocumentHeightTwips);
+        else
+            priv->m_pDocument->pClass->getDocumentSize(priv->m_pDocument, &priv->m_nDocumentWidthTwips, &priv->m_nDocumentHeightTwips);
+
         gtk_widget_set_size_request(GTK_WIDGET(pDocView),
                                     twipToPixel(priv->m_nDocumentWidthTwips, priv->m_fZoom),
                                     twipToPixel(priv->m_nDocumentHeightTwips, priv->m_fZoom));