diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-03-12 16:26:23 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-03-16 08:44:15 +0100 |
| commit | 3621c927b4555cb437fb89d28473228cb5d8e11a (patch) | |
| tree | e4bcefeaf25c97b10c386710bab864af6373eea5 /uui/source/iahndl-locking.cxx | |
| parent | 6d40302d89e1a72841c8a64733c7a26080a65cb8 (diff) | |
Add option to disallow opening files locked by other users
Change-Id: I316b80a56b0d6dcb257fbc805fbac3afc93472ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90425
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'uui/source/iahndl-locking.cxx')
| -rw-r--r-- | uui/source/iahndl-locking.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index f4297754d6b5..07a69699e9b8 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -31,6 +31,7 @@ #include <unotools/resmgr.hxx> #include <vcl/svapp.hxx> +#include <officecfg/Office/Common.hxx> #include <strings.hrc> #include "getcontinuations.hxx" @@ -84,7 +85,8 @@ handleLockedDocumentRequest_( aArguments.push_back( !aInfo.isEmpty() ? aInfo : Translate::get( STR_UNKNOWNUSER, aResLocale) ); - aArguments.push_back( xRetry.is() + bool bAllowOverride = xRetry.is() && officecfg::Office::Common::Misc::AllowOverrideLocking::get(); + aArguments.push_back( bAllowOverride ? Translate::get( STR_OPENLOCKED_ALLOWIGNORE_MSG, aResLocale ) : "" ); aMessage = Translate::get(STR_OPENLOCKED_MSG, aResLocale); |