summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-27 08:33:13 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-27 09:16:24 +0100
commit496ee4fcbe697552622901dfb72775d07496bdb0 (patch)
tree99cf3f93cdbca6087fcc1aceef850760f5ed1896 /sd
parenta7ef614ff261a90790041bc29e8038d1813e01e6 (diff)
config-less fallback value
Change-Id: Id2ee43ff95b6d28252f58e4930b81faf8b3b4b7f
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/TransitionPreset.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index d7bc31ed4788..e19e6646de80 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/animations/AnimationNodeType.hpp>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
+#include <unotools/configmgr.hxx>
#include <unotools/streamwrap.hxx>
#include <comphelper/getexpandeduri.hxx>
#include <comphelper/processfactory.hxx>
@@ -134,6 +135,9 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList )
{
+ if (utl::ConfigManager::IsAvoidConfig())
+ return false;
+
bool bRet = false;
try