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

add a config-less fallback here

Browse Source 
Change-Id: Iee6bb57445a066d43c0d62ca0d56fd13bd589980
This commit is contained in:
Caolán McNamara
2017-03-06 11:16:57 +00:00
parent 929358286c
commit 866d4db725
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unotools/source/misc/mediadescriptor.cxx
View File

@@ -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);
}
/*-----------------------------------------------*/