diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-03 17:08:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-03 17:08:44 +0000 |
| commit | 4032957469cf9847e0aa830dc922f4acd86e32ba (patch) | |
| tree | 40f3cbdd0bd09b29e482328d08775bb534b3cb5a /svx/source/gallery2 | |
| parent | 3e5d94266e7f60c2b3ebd7009579373fddb400cd (diff) | |
avoid config and gallery for ppt loader testing
Change-Id: I3512f4b7551ef79dc0aed564219cef84aad91a2f
Diffstat (limited to 'svx/source/gallery2')
| -rw-r--r-- | svx/source/gallery2/gallery1.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index c0743ebef9af..24c88101efea 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -33,6 +33,7 @@ #include <osl/thread.h> #include <tools/vcompat.hxx> #include <ucbhelper/content.hxx> +#include <unotools/configmgr.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/docfile.hxx> @@ -181,7 +182,7 @@ Gallery* Gallery::GetGalleryInstance() if (!s_pGallery) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if (!s_pGallery) + if (!s_pGallery && !utl::ConfigManager::IsAvoidConfig()) { s_pGallery = new Gallery( SvtPathOptions().GetGalleryPath() ); } |