slideshow/Library_slideshow.mk | 4 ++++
slideshow/source/engine/effectrewinder.cxx | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 886b6a3a8df29efd10dab186407205440fbde54d
Author: Gülşah Köse <gulsah.k...@collabora.com>
AuthorDate: Wed Dec 18 15:06:38 2019 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Dec 21 22:01:58 2019 +0100
tdf#125949 Check hardware acceleration on slideshow.
Follow up commit for 8eb2d2972583b909a249f5b0f22a9b1fbf533d24
Allows animation if hardware acceleration disabled.
Change-Id: I7997936435134e36e2bf3d3d54ff1bf157cb205c
Reviewed-on: https://gerrit.libreoffice.org/85380
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.k...@collabora.com>
(cherry picked from commit 3e88fc6b0eef06e1e12fcfe765e3092c6c06ce5c)
Reviewed-on: https://gerrit.libreoffice.org/85432
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index d1526754a1fb..9f41d23ffd08 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -35,6 +35,10 @@ $(eval $(call gb_Library_use_externals,slideshow,\
))
endif
+$(eval $(call gb_Library_use_custom_headers,slideshow,\
+ officecfg/registry \
+))
+
$(eval $(call gb_Library_use_sdk_api,slideshow))
$(eval $(call gb_Library_use_libraries,slideshow,\
diff --git a/slideshow/source/engine/effectrewinder.cxx
b/slideshow/source/engine/effectrewinder.cxx
index 5db91ff9a621..d8889024108b 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -30,6 +30,9 @@
#include <com/sun/star/animations/EventTrigger.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/animations/XAnimate.hpp>
+
+#include <officecfg/Office/Canvas.hxx>
+
using ::com::sun::star::uno::Reference;
using namespace ::com::sun::star;
@@ -346,7 +349,9 @@ bool EffectRewinder::notifyAnimationStart (const
AnimationNodeSharedPtr& rpNode)
{
Reference<animations::XAnimationNode> xNode (rpNode->getXAnimationNode());
- if(xNode.is() && hasBlockedAnimation(xNode) )
+ if( xNode.is() &&
+ !officecfg::Office::Canvas::ForceSafeServiceImpl::get() &&
+ hasBlockedAnimation(xNode) )
skipSingleMainSequenceEffects();
// This notification is only relevant for us when the rpNode belongs to
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
