diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2019-12-18 15:06:38 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-12-21 22:01:58 +0100 |
| commit | 886b6a3a8df29efd10dab186407205440fbde54d (patch) | |
| tree | 35512d5615a40ab0c19cedd3e61048ba9fe46fe7 /slideshow | |
| parent | 7f9e67a70b7c84de1d84ced1409271fb8845ee9f (diff) | |
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.kose@collabora.com>
(cherry picked from commit 3e88fc6b0eef06e1e12fcfe765e3092c6c06ce5c)
Reviewed-on: https://gerrit.libreoffice.org/85432
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/Library_slideshow.mk | 4 | ||||
| -rw-r--r-- | slideshow/source/engine/effectrewinder.cxx | 7 |
2 files changed, 10 insertions, 1 deletions
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 |