svx/source/gallery2/gallery1.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4032957469cf9847e0aa830dc922f4acd86e32ba
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Mar 3 17:08:44 2017 +0000
avoid config and gallery for ppt loader testing
Change-Id: I3512f4b7551ef79dc0aed564219cef84aad91a2f
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index c0743eb..24c8810 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() );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
