mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use a default when avoiding config

Browse Source 
Change-Id: I5f068a4f8f2f035070ea3ad16bf6d89f7ab0e0fd
This commit is contained in:
Caolán McNamara
2015-10-21 16:06:08 +01:00
parent f80d42876a
commit d4ef1860f2
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
svx/source/sdr/contact/objectcontactofpageview.cxx
View File

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