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

[Pranam Lashkari (via logerrit)]

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

New commits:
commit aeb53d226f0ef804cbe90d1e27a48bf5f7e8633f
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Fri Jul 16 16:42:04 2021 +0530
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Aug 5 14:21:17 2021 +0200

    LOK: freemium: added new parameter in the API
    
    Added new parameter in the freemium API to make it consistent with other APIs
    
    Change-Id: Ieb73fd1f97e1886051b1de44a93ba87622862e2e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119974
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1ebf880b0a31..7bc76e42ab8a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1048,9 +1048,12 @@ static void doc_postKeyEvent(LibreOfficeKitDocument* pThis,
                              int nType,
                              int nCharCode,
                              int nKeyCode);
-static void doc_setFreemiumDenyList(const char* freemiumDenyList);
+static void doc_setFreemiumDenyList(LibreOfficeKitDocument* pThis,
+                                    const char* freemiumDenyList);
 
-static void doc_setFreemiumView(int nViewId, bool isFreemium);
+static void doc_setFreemiumView(LibreOfficeKitDocument* pThis,
+                                int nViewId,
+                                bool isFreemium);
 
 static void doc_postWindowExtTextInputEvent(LibreOfficeKitDocument* pThis,
                                             unsigned nWindowId,
@@ -3559,12 +3562,12 @@ static void doc_postKeyEvent(LibreOfficeKitDocument* pThis, int nType, int nChar
     }
 }
 
-static void doc_setFreemiumDenyList(const char* freemiumDenyList)
+static void doc_setFreemiumDenyList(LibreOfficeKitDocument* /*pThis*/, const char* freemiumDenyList)
 {
     comphelper::LibreOfficeKit::setFreemiumDenyList(freemiumDenyList);
 }
 
-static void doc_setFreemiumView(int nViewId, bool isFreemium)
+static void doc_setFreemiumView(LibreOfficeKitDocument* /*pThis*/, int nViewId, bool isFreemium)
 {
     SolarMutexGuard aGuard;
     SfxLokHelper::setFreemiumView(nViewId, isFreemium);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h
index 8383aeb9d920..fddec94a22f4 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -459,10 +459,13 @@ struct _LibreOfficeKitDocumentClass
                                 const char* pArguments);
 
     /// @see lok::Document::setFreemiumDenyList
-    void (*setFreemiumDenyList) (const char* freemiumDenyList);
+    void (*setFreemiumDenyList) (LibreOfficeKitDocument* pThis,
+                                const char* freemiumDenyList);
 
     /// @see lok::Document::setFreemiumView
-    void (*setFreemiumView) (int nViewId, bool isFreemium);
+    void (*setFreemiumView) (LibreOfficeKitDocument* pThis,
+                            int nViewId,
+                            bool isFreemium);
 
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 2756dac9c919..aab8b94c8aae 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -789,12 +789,12 @@ public:
 
     void setFreemiumDenyList(const char* freemiumDenyList)
     {
-        mpDoc->pClass->setFreemiumDenyList(freemiumDenyList);
+        mpDoc->pClass->setFreemiumDenyList(mpDoc, freemiumDenyList);
     }
 
     void setFreemiumView(int nViewId, bool isFreemium)
     {
-        mpDoc->pClass->setFreemiumView(nViewId, isFreemium);
+        mpDoc->pClass->setFreemiumView(mpDoc, nViewId, isFreemium);
     }
 
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY