[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source include/LibreOfficeKit

[Szymon KÅ‚os (via logerrit)]

 desktop/source/lib/init.cxx               |    4 ++--
 include/LibreOfficeKit/LibreOfficeKit.h   |    2 +-
 include/LibreOfficeKit/LibreOfficeKit.hxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit eaafb80e02dddb8d7c8c00d338e827cdaf427f01
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Jun 24 11:27:39 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jun 26 09:24:16 2020 +0200

    jsdialog: change sendDialogEvent API parameter
    
    WindowId with 64bit length is needed
    
    Change-Id: Ia11530fb4666fc64d7acde653085ed258058c169
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97100
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f5631188a841..9867c88709ab 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1014,7 +1014,7 @@ static void doc_removeTextContext(LibreOfficeKitDocument* pThis,
                                   int nCharBefore,
                                   int nCharAfter);
 static void doc_sendDialogEvent(LibreOfficeKitDocument* pThis,
-                               unsigned nLOKWindowId,
+                               unsigned long long int nLOKWindowId,
                                const char* pArguments);
 static void doc_postWindowKeyEvent(LibreOfficeKitDocument* pThis,
                                    unsigned nLOKWindowId,
@@ -3578,7 +3578,7 @@ public:
     virtual void SAL_CALL disposing(const css::lang::EventObject&) override {}
 };
 
-static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWindowId, const char* pArguments)
+static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned long long int nWindowId, const char* pArguments)
 {
     SolarMutexGuard aGuard;
 
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h
index 8b68452697b3..f4244def5a6b 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -416,7 +416,7 @@ struct _LibreOfficeKitDocumentClass
 
     /// @see lok::Document::sendDialogEvent
     void (*sendDialogEvent) (LibreOfficeKitDocument* pThis,
-                            unsigned nLOKWindowId,
+                            unsigned long long int nLOKWindowId,
                             const char* pArguments);
 
     /// @see lok::Document::renderFontOrientation().
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 91ece38c96a4..2192d9870d01 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -309,7 +309,7 @@ public:
      * @param nWindowId id of the window to notify
      * @param pArguments arguments of the event.
      */
-    void sendDialogEvent(unsigned nWindowId, const char* pArguments = NULL)
+    void sendDialogEvent(unsigned long long int nWindowId, const char* pArguments = NULL)
     {
         mpDoc->pClass->sendDialogEvent(mpDoc, nWindowId, pArguments);
     }