[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - libreofficekit/qa sd/source

[Ashod Nakashian (via logerrit)]

 libreofficekit/qa/gtktiledviewer/gtv-application.cxx |    7 +++++++
 sd/source/ui/animations/CustomAnimationPane.cxx      |    4 ++++
 2 files changed, 11 insertions(+)

New commits:
commit fc3742a39ea2bd7a30dc4f97d5d70a173c08ca4a
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon Apr 29 22:21:39 2019 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 3 13:41:10 2019 +0200

    gtktiledviewer: provide activation function
    
    This fixes the gtktiledviewer on some distros/gtk
    versions that require an activation function to be
    provided.
    
    Change-Id: I95fb3ed4e92e27d9c725ca38b4cb5a4f8af51771
    Reviewed-on: https://gerrit.libreoffice.org/71588
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 6ac2ce64ddd4e2fcdfc0f8f50fae36a78f87f9ab)
    Reviewed-on: https://gerrit.libreoffice.org/78447
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
index 3d802ee325d4..cd0a88a85fe2 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
@@ -28,6 +28,12 @@ getPrivate(GtvApplication* app)
 }
 
 static void
+gtv_application_activate(GApplication*)
+{
+    // If this isn't provided, some GTK versions fail to run us at all.
+}
+
+static void
 gtv_application_open(GApplication* app, GFile** file, gint /*nFiles*/, const gchar* /*hint*/)
 {
     // TODO: add some option to create a new view for existing document
@@ -142,6 +148,7 @@ gtv_application_handle_local_options(GApplication* app, GVariantDict* options)
 static void
 gtv_application_class_init(GtvApplicationClass* klass)
 {
+    G_APPLICATION_CLASS(klass)->activate = gtv_application_activate;
     G_APPLICATION_CLASS(klass)->open = gtv_application_open;
     G_APPLICATION_CLASS(klass)->handle_local_options = gtv_application_handle_local_options;
     G_OBJECT_CLASS(klass)->dispose = gtv_application_dispose;
commit 40cb61e0943a14a6848c43dc9f4c951f540118f3
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Fri Nov 23 08:02:04 2018 -0500
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 3 13:40:53 2019 +0200

    LOK: sd: no animation preview for LOK
    
    Change-Id: I67babe9b340bafd196dedb2918d6a24bfc9c0ad5
    (cherry picked from commit 259ce91cb63baa049bc57db79fd922ab5fd8be57)
    Reviewed-on: https://gerrit.libreoffice.org/78446
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 0db0f4723d8f..fe0e5cd48571 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2418,6 +2418,10 @@ void CustomAnimationPane::onPreview( bool bForcePreview )
     if( !bForcePreview && !mpCBAutoPreview->IsChecked() )
         return;
 
+    // No preview in LOK.
+    if (comphelper::LibreOfficeKit::isActive())
+        return;
+
     if( maListSelection.empty() )
     {
         rtl::Reference< MotionPathTag > xMotionPathTag;