diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-06 11:16:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-06 11:16:57 +0000 |
| commit | 866d4db725c836b1bd714d0ffcbc4a788cfe4f9d (patch) | |
| tree | 12269b4b76946ce462b05d76610ef396ec5ca577 /unotools | |
| parent | 929358286c4a21c3f19284246ba1a99200b64bf2 (diff) | |
add a config-less fallback here
Change-Id: Iee6bb57445a066d43c0d62ca0d56fd13bd589980
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/misc/mediadescriptor.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx index 68d9f030e10e..5d5dd7ecfff4 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); } /*-----------------------------------------------*/ |