diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2021-07-25 21:35:05 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-26 14:25:35 +0200 |
commit | 6ed8c5a0f19901ab413c6610649326b2475c3a8c (patch) | |
tree | 948037d1a61f9e88547b88e107ba6e8a306c3833 /sc | |
parent | a23b44fd9f0119f7ea3523e32875f55c1a07c1cd (diff) |
use officecfg for security options
Change-Id: I9d91fd5b260b82e05aac6567143386742953ecf6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119486
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/global.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index d3a41340cfe3..8c18329ab67b 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -824,9 +824,8 @@ void ScGlobal::OpenURL(const OUString& rURL, const OUString& rTarget, bool bIgno bool ScGlobal::ShouldOpenURL() { - SvtSecurityOptions aSecOpt; bool bCtrlClickHappened = (nScClickMouseModifier & KEY_MOD1); - bool bCtrlClickSecOption = aSecOpt.IsOptionSet( SvtSecurityOptions::EOption::CtrlClickHyperlink ); + bool bCtrlClickSecOption = SvtSecurityOptions::IsOptionSet( SvtSecurityOptions::EOption::CtrlClickHyperlink ); if( bCtrlClickHappened && ! bCtrlClickSecOption ) { // return since ctrl+click happened when the diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index f3eca38a7da9..1f166eedfa19 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -168,10 +168,10 @@ ScLkUpdMode ScDocShell::GetLinkUpdateModeState() const nSet = LM_ALWAYS; if (nSet == LM_ALWAYS - && !(SvtSecurityOptions().isTrustedLocationUriForUpdatingLinks( + && !(SvtSecurityOptions::isTrustedLocationUriForUpdatingLinks( GetMedium() == nullptr ? OUString() : GetMedium()->GetName()) || (IsDocShared() - && SvtSecurityOptions().isTrustedLocationUriForUpdatingLinks( + && SvtSecurityOptions::isTrustedLocationUriForUpdatingLinks( GetSharedFileURL())))) { nSet = LM_ON_DEMAND; |