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

[Jan Holesovsky (via logerrit)]

 include/LibreOfficeKit/LibreOfficeKit.hxx |    2 +-
 libreofficekit/qa/tilebench/tilebench.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 237aa2fe367d3369265b0f935f7521560bc2c61a
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu May 2 11:14:40 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu May 2 11:22:19 2019 +0200

    lok: We changed the (unstable) ABI, but let's allow the older C++ API.
    
    Helps building the Online before the appropriate patch gets merged.
    
    Change-Id: I9983d546bb0cb7fb472806622a0a10e3a4d3ab87
    Reviewed-on: https://gerrit.libreoffice.org/71664
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index f52e96332b7f..235053fa0adb 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -188,7 +188,7 @@ public:
      *
      * @param nWindowid
      */
-    void postWindow(unsigned nWindowId, int nAction, const char* pData)
+    void postWindow(unsigned nWindowId, int nAction, const char* pData = nullptr)
     {
         return mpDoc->pClass->postWindow(mpDoc, nWindowId, nAction, pData);
     }
diff --git a/libreofficekit/qa/tilebench/tilebench.cxx b/libreofficekit/qa/tilebench/tilebench.cxx
index 6cda7348ccaf..4cb76dd1366e 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -278,7 +278,7 @@ void testDialog( Document *pDocument, const char *uno_cmd )
     }
 
     aTimes.emplace_back("post close dialog");
-    pDocument->postWindow(nDialogId, LOK_WINDOW_CLOSE, nullptr);
+    pDocument->postWindow(nDialogId, LOK_WINDOW_CLOSE);
     aTimes.emplace_back();
 
     pDocument->destroyView(view);