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

[Andras Timar (via logerrit)]

 sd/source/ui/animations/CustomAnimationDialog.cxx |   15 +++++++++++++--
 sd/source/ui/animations/SlideTransitionPane.cxx   |    3 +++
 2 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit e69fbd9352ffb440be0cd0f08b815e71d23efbce
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Apr 12 17:03:09 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Apr 12 21:07:34 2020 +0200

    LOKit: Hide sound controls on Impress Custom Animation Dialog
    
    In Online, sounds cannot be heard, cannot be selected, so it's confusing
    to have sound settings on the Custom Animation Dialog
    
    Change-Id: Iff5155289700c412d9e50542de7e4fcf7830b67a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92085
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 09552e8cbf27..8141f9d5f6ce 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -36,6 +36,7 @@
 
 #include <memory>
 
+#include <comphelper/lok.hxx>
 #include <i18nutil/unicode.hxx>
 #include <unotools/pathoptions.hxx>
 #include <vcl/tabctrl.hxx>
@@ -1981,8 +1982,18 @@ void CustomAnimationEffectTabPage::updateControlStates()
         mxFTTextDelay->set_sensitive( nPos != 0 );
     }
 
-    nPos = mxLBSound->get_active();
-    mxPBSoundPreview->set_sensitive( nPos >= 2 );
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        mxFTSound->hide();
+        mxLBSound->hide();
+        mxPBSoundPreview->hide();
+    }
+    else
+    {
+        nPos = mxLBSound->get_active();
+        mxPBSoundPreview->set_sensitive( nPos >= 2 );
+    }
+
 }
 
 IMPL_LINK(CustomAnimationEffectTabPage, implClickHdl, weld::Button&, rBtn, void)
commit 985aa0bb1881ecda17c5e00e1d24e131a69737fa
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Apr 12 16:36:07 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Apr 12 21:07:20 2020 +0200

    LOKit: Hide sound controls on Impress sidebar's Slide transition pane
    
    In Online, sounds cannot be heard, cannot be selected, so it's confusing
    to have sound settings on the Online sidebar.
    
    Change-Id: Ica4ee1e73bc0972048986ff9c2fbcba5d4bd9bd8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92084
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 9da8963f91ab..c5a7f3c58da9 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -704,6 +704,9 @@ void SlideTransitionPane::updateControls()
         mpPB_PLAY->Hide();
         mpCB_AUTO_PREVIEW->Check(false);
         mpCB_AUTO_PREVIEW->Hide();
+        mpFT_SOUND->Hide();
+        mpLB_SOUND->Hide();
+        mpCB_LOOP_SOUND->Hide();
     }
     else
     {