[Libreoffice-commits] core.git: svx/source

[Caolán McNamara]

 svx/source/sdr/contact/objectcontactofpageview.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit d4ef1860f268efb5a7ec5cdbce69b40b8f228dd8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 21 16:06:08 2015 +0100

    use a default when avoiding config
    
    Change-Id: I5f068a4f8f2f035070ea3ad16bf6d89f7ab0e0fd

diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index f27bfdd..4786c7a 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 #include <svx/unoapi.hxx>
+#include <unotools/configmgr.hxx>
 
 #include "eventhandler.hxx"
 #include <memory>
@@ -393,6 +394,8 @@ namespace sdr
         // check if text animation is allowed.
         bool ObjectContactOfPageView::IsTextAnimationAllowed() const
         {
+            if (utl::ConfigManager::IsAvoidConfig())
+                return true;
             SdrView& rView = GetPageWindow().GetPageView().GetView();
             const SvtAccessibilityOptions& rOpt = rView.getAccessibilityOptions();
             return rOpt.GetIsAllowAnimatedText();
@@ -401,6 +404,8 @@ namespace sdr
         // check if graphic animation is allowed.
         bool ObjectContactOfPageView::IsGraphicAnimationAllowed() const
         {
+            if (utl::ConfigManager::IsAvoidConfig())
+                return true;
             SdrView& rView = GetPageWindow().GetPageView().GetView();
             const SvtAccessibilityOptions& rOpt = rView.getAccessibilityOptions();
             return rOpt.GetIsAllowAnimatedGraphics();