sd/source/ui/animations/CustomAnimationPane.cxx | 4 ++++ sfx2/source/sidebar/ResourceManager.cxx | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
New commits: commit 2321771b7a16e67c0b035913c7500c1887734c63 Author: Ashod Nakashian <[email protected]> AuthorDate: Fri Nov 23 08:02:04 2018 -0500 Commit: Noel Grandin <[email protected]> CommitDate: Fri Jul 26 15:03:23 2019 +0200 LOK: sd: no animation preview for LOK Change-Id: I67babe9b340bafd196dedb2918d6a24bfc9c0ad5 Reviewed-on: https://gerrit.libreoffice.org/73515 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 082d150d5a99..f5ad1821e367 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2351,6 +2351,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; commit ca54fdefb9f063af125a3083ec67a7a17541c5c1 Author: Ashod Nakashian <[email protected]> AuthorDate: Thu Nov 22 16:47:49 2018 -0500 Commit: Noel Grandin <[email protected]> CommitDate: Fri Jul 26 15:03:15 2019 +0200 LOK: sidebar: hide gallery, navigation and styles decks These aren't fully functional, so not very useful in LOK. Change-Id: If6330b1f7bf911bbb9edad00aaea7c4d37671746 Reviewed-on: https://gerrit.libreoffice.org/73514 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index f59efbab5706..1dfcd370794c 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -24,6 +24,7 @@ #include <officecfg/Office/UI/Sidebar.hxx> #include <unotools/confignode.hxx> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/sequence.hxx> @@ -258,7 +259,16 @@ void ResourceManager::ReadDeckList() maDecks.clear(); for (sal_Int32 nReadIndex(0); nReadIndex<nCount; ++nReadIndex) { - const utl::OConfigurationNode aDeckNode(aDeckRootNode.openNode(aDeckNodeNames[nReadIndex])); + const OUString aDeckName = aDeckNodeNames[nReadIndex]; + if (comphelper::LibreOfficeKit::isActive()) + { + // Hide these decks in LOK as they aren't fully functional. + if (aDeckName == "GalleryDeck" || aDeckName == "NavigatorDeck" + || aDeckName == "StyleListDeck") + continue; + } + + const utl::OConfigurationNode aDeckNode(aDeckRootNode.openNode(aDeckName)); if (!aDeckNode.isValid()) continue; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
