[Libreoffice-commits] core.git: include/LibreOfficeKit libreofficekit/qa

Jan Holesovsky (via logerrit) logerrit at kemper.freedesktop.org
Thu May 2 09:40:23 UTC 2019


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

New commits:
commit a6d146074dce236f84e0194539413e7d551b5065
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:39:30 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/71665
    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 47983e68fa27..64aac1b361c5 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 d0fc87283d35..61d337f6c518 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -286,7 +286,7 @@ static 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);


More information about the Libreoffice-commits mailing list