[Libreoffice-commits] core.git: sd/source
Ashod Nakashian (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 25 08:58:31 UTC 2019
sd/source/ui/animations/CustomAnimationPane.cxx | 14 ++++++++++++--
sd/source/ui/animations/SlideTransitionPane.cxx | 14 ++++++++++++--
2 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit a59b4a2dcec4ad2131350a9999185ebcd07c5fc8
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sat Aug 18 09:59:53 2018 -0400
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jul 25 10:57:51 2019 +0200
sidebar: hide preview and play controls in lokit
Change-Id: I7fc9470082612af4c4d7e56ff704936da5c63ce4
Reviewed-on: https://gerrit.libreoffice.org/73501
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index ee1807187fbd..082d150d5a99 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -51,6 +51,7 @@
#include <vcl/button.hxx>
+#include <comphelper/lok.hxx>
#include <comphelper/sequence.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/sidebar/Theme.hxx>
@@ -472,8 +473,17 @@ void CustomAnimationPane::updateControls()
mpFTDuration->Enable( mxView.is() );
mpCBXDuration->Enable( mxView.is() );
mpCustomAnimationList->Enable( mxView.is() );
- mpPBPlay->Enable( mxView.is() );
- mpCBAutoPreview->Enable( mxView.is() );
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ mpPBPlay->Hide();
+ mpCBAutoPreview->Check(false);
+ mpCBAutoPreview->Hide();
+ }
+ else
+ {
+ mpPBPlay->Enable( mxView.is() );
+ mpCBAutoPreview->Enable( mxView.is() );
+ }
if( !mxView.is() )
{
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index e7b3442b6b1d..998b0c58ef6b 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -33,6 +33,7 @@
#include <strings.hrc>
#include <EventMultiplexer.hxx>
+#include <comphelper/lok.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <svx/gallery.hxx>
@@ -684,8 +685,17 @@ void SlideTransitionPane::updateControls()
mpMF_ADVANCE_AUTO_AFTER->SetValue( aEffect.mfTime * 100.0);
}
- SdOptions* pOptions = SD_MOD()->GetSdOptions(DocumentType::Impress);
- mpCB_AUTO_PREVIEW->Check( pOptions->IsPreviewTransitions() );
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ mpPB_PLAY->Hide();
+ mpCB_AUTO_PREVIEW->Check(false);
+ mpCB_AUTO_PREVIEW->Hide();
+ }
+ else
+ {
+ SdOptions* pOptions = SD_MOD()->GetSdOptions(DocumentType::Impress);
+ mpCB_AUTO_PREVIEW->Check( pOptions->IsPreviewTransitions() );
+ }
mbUpdatingControls = false;
More information about the Libreoffice-commits
mailing list