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 /editeng | |
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 'editeng')
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 3 | ||||
-rw-r--r-- | editeng/source/items/frmitems.cxx | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index e89c1258bc33..e31585816e13 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -615,10 +615,9 @@ bool ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView ) // tdf#121039 When in edit mode, editeng is responsible for opening the URL on mouse click if (auto pUrlField = dynamic_cast<const SvxURLField*>(pFld->GetField())) { - SvtSecurityOptions aSecOpt; bool bCtrlClickHappened = rMEvt.IsMod1(); bool bCtrlClickSecOption - = aSecOpt.IsOptionSet(SvtSecurityOptions::EOption::CtrlClickHyperlink); + = SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::CtrlClickHyperlink); if ((bCtrlClickHappened && bCtrlClickSecOption) || (!bCtrlClickHappened && !bCtrlClickSecOption)) { diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index d8e82beb40b9..7027ae7c2914 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -72,6 +72,7 @@ #include <o3tl/enumrange.hxx> #include <o3tl/safeint.hxx> #include <vcl/GraphicLoader.hxx> +#include <unotools/securityoptions.hxx> #include <boost/property_tree/ptree.hpp> @@ -3174,7 +3175,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co if (bLoadAgain && !maStrLink.isEmpty() && !xGraphicObject) // when graphics already loaded, use as a cache { - if (maSecOptions.isUntrustedReferer(referer)) { + if (SvtSecurityOptions::isUntrustedReferer(referer)) { return nullptr; } |