summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-05-02 11:14:40 +0200
committerMichael Meeks <michael.meeks@collabora.com>2019-09-23 15:10:25 +0100
commit637e8103ce372e84a175ec6cc01a816fbd3b7927 (patch)
treeda8234896ea6b605b231429083457b5f04e08240
parentunipoll: add a --unipoll parameter to gtktiledviewer. (diff)
downloadcore-637e8103ce372e84a175ec6cc01a816fbd3b7927.tar.gz
core-637e8103ce372e84a175ec6cc01a816fbd3b7927.zip
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@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r--include/LibreOfficeKit/LibreOfficeKit.hxx2
-rw-r--r--libreofficekit/qa/tilebench/tilebench.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index e2ca0902edd7..dd0ad0391643 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);