sd/source/ui/animations/CustomAnimationDialog.cxx | 15 +++++++++++++-- sd/source/ui/animations/SlideTransitionPane.cxx | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-)
New commits: commit f34c0e2be713d335738f176b3aa5e6bacfb57455 Author: Andras Timar <[email protected]> AuthorDate: Sun Apr 12 17:03:09 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu May 14 22:48:26 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 <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 1052b7b89e9c..2968ef5a7d2f 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -35,6 +35,7 @@ #include <memory> +#include <comphelper/lok.hxx> #include <i18nutil/unicode.hxx> #include <vcl/menubtn.hxx> #include <vcl/svapp.hxx> @@ -1974,8 +1975,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 9456c306990745e0e496bec930e7250bf086b678 Author: Andras Timar <[email protected]> AuthorDate: Sun Apr 12 16:36:07 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu May 14 22:48:08 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 <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 4bc3e3577b61..0a7459b66fea 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -691,6 +691,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 { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
