[Libreoffice-commits] core.git: 2 commits - desktop/source include/LibreOfficeKit sfx2/source

[Pranam Lashkari (via logerrit)]

 desktop/source/lib/init.cxx               |   11 +++++++----
 include/LibreOfficeKit/LibreOfficeKit.h   |    7 +++++--
 include/LibreOfficeKit/LibreOfficeKit.hxx |    4 ++--
 sfx2/source/view/viewsh.cxx               |    1 +
 4 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit f4538c29079a4a940540e5194075aaeee4d0ba3a
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Fri Jul 16 16:42:04 2021 +0530
Commit:     Pranam Lashkari <lpranam at collabora.com>
CommitDate: Mon Aug 16 09:01:54 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>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120484
    Tested-by: Jenkins
    Reviewed-by: Pranam Lashkari <lpranam at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0eecb2b4b352..18ee858c72c0 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1043,9 +1043,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,
@@ -3557,12 +3560,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 527fee4f2e7d..79a6b2a3faea 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -464,10 +464,13 @@ struct _LibreOfficeKitDocumentClass
                                 unsigned char** pBitmapBuffer,
                                 int* pWidth, int* pHeight, size_t* pByteSize);
     /// @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 cd35cdc51fe6..778f3a80d3fe 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -804,12 +804,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
commit 085797cb5c26a274328fa639a8100bd52cd9652d
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jul 8 11:49:13 2021 +0200
Commit:     Pranam Lashkari <lpranam at collabora.com>
CommitDate: Mon Aug 16 09:01:34 2021 +0200

    sfx2: fix uninitialized SfxViewShell::mbLOKIsFreemiumView
    
    Introduced in commit 1b9fe58acb7b5bbbc83ecca30e17663fff7f0db4 (LOK:
    introduced Freemium LOK API, 2021-06-02).
    
    Change-Id: Ifdd6c13a64a167fa00b0305441c52340167f3809
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118632
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Pranam Lashkari <lpranam at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120483
    Tested-by: Jenkins

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 177ed2c69e21..c58f5b2fdbd8 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1068,6 +1068,7 @@ SfxViewShell::SfxViewShell
 ,   maLOKLanguageTag(LANGUAGE_NONE)
 ,   maLOKLocale(LANGUAGE_NONE)
 ,   maLOKDeviceFormFactor(LOKDeviceFormFactor::UNKNOWN)
+,   mbLOKIsFreemiumView(false)
 {
     SetMargin( pViewFrame->GetMargin_Impl() );