[Libreoffice-commits] online.git: loolwsd/bundled loolwsd/LOKitClient.cpp loolwsd/LOOLSession.cpp

Miklos Vajna vmiklos at collabora.co.uk
Wed Nov 18 08:02:03 PST 2015


 loolwsd/LOKitClient.cpp                                 |    2 +-
 loolwsd/LOOLSession.cpp                                 |    2 +-
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit fe1aacd6d0fc98d3564715c40eab61f66b49331d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Nov 18 16:59:28 2015 +0100

    loolwsd: update the bundled headers

diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index a2eeb77..6f2f016 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -103,7 +103,7 @@ protected:
 
         loKitDocument->pClass->registerCallback(loKitDocument, myCallback, NULL);
 
-        loKitDocument->pClass->initializeForRendering(loKitDocument);
+        loKitDocument->pClass->initializeForRendering(loKitDocument, nullptr);
 
         if (isatty(0))
         {
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index c65b6ab..b6abe34 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -990,7 +990,7 @@ bool ChildProcessSession::loadDocument(const char *buffer, int length, StringTok
         return false;
     }
 
-    _loKitDocument->pClass->initializeForRendering(_loKitDocument);
+    _loKitDocument->pClass->initializeForRendering(_loKitDocument, nullptr);
 
     if ( _docType != "text" && part != -1)
     {
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 0321037..93f7dca 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -124,7 +124,8 @@ struct _LibreOfficeKitDocumentClass
                              long* pHeight);
 
     /// @see lok::Document::initializeForRendering().
-    void (*initializeForRendering) (LibreOfficeKitDocument* pThis);
+    void (*initializeForRendering) (LibreOfficeKitDocument* pThis,
+                                    const char* pArguments);
 
     /// @see lok::Document::registerCallback().
     void (*registerCallback) (LibreOfficeKitDocument* pThis,


More information about the Libreoffice-commits mailing list