unotools/source/misc/mediadescriptor.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 866d4db725c836b1bd714d0ffcbc4a788cfe4f9d
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Mar 6 11:16:57 2017 +0000
add a config-less fallback here
Change-Id: Iee6bb57445a066d43c0d62ca0d56fd13bd589980
diff --git a/unotools/source/misc/mediadescriptor.cxx
b/unotools/source/misc/mediadescriptor.cxx
index 68d9f03..5d5dd7e 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -19,6 +19,7 @@
#include <comphelper/docpasswordhelper.hxx>
#include <sal/log.hxx>
+#include <unotools/configmgr.hxx>
#include <unotools/mediadescriptor.hxx>
#include <unotools/securityoptions.hxx>
#include <unotools/ucbhelper.hxx>
@@ -483,8 +484,10 @@ bool MediaDescriptor::addInputStream()
/*-----------------------------------------------*/
bool MediaDescriptor::addInputStreamOwnLock()
{
- return impl_addInputStream(
- officecfg::Office::Common::Misc::UseDocumentSystemFileLocking::get());
+ const bool bLock = utl::ConfigManager::IsAvoidConfig()
+ ? false
+ :
officecfg::Office::Common::Misc::UseDocumentSystemFileLocking::get();
+ return impl_addInputStream(bLock);
}
/*-----------------------------------------------*/
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
