diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:03 +0000 |
| commit | 5a7157d319477830426797532e02ac39d3b859f4 (patch) | |
| tree | 3773f5ce209bee14a5643e98672e0f3828c71434 /sfx2/source/appl | |
| parent | Releasing progress-linux version 4:24.2.0-3~progress7.99u1. (diff) | |
| download | libreoffice-5a7157d319477830426797532e02ac39d3b859f4.tar.xz libreoffice-5a7157d319477830426797532e02ac39d3b859f4.zip | |
Merging upstream version 4:24.2.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index cccc2abc1a..58963ceed2 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1483,6 +1483,20 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) break; } + case SID_OPTIONS_SECURITY: + { + SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); + VclPtr<AbstractSecurityOptionsDialog> pDlg = + pFact->CreateSvxSecurityOptionsDialog(rReq.GetFrameWeld()); + + if (pDlg->Execute() == RET_OK) { + pDlg->SetSecurityOptions(); + } + + pDlg.disposeAndClear(); + break; + } + case SID_MORE_DICTIONARIES: { uno::Sequence<beans::PropertyValue> aArgs{ comphelper::makePropertyValue( diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index b596a4e33e..785872ddee 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -665,6 +665,10 @@ OUString SfxHelp::GetHelpText(const OUString& aCommandURL, const weld::Widget* p OUString SfxHelp::GetURLHelpText(std::u16string_view aURL) { + // hyperlinks are handled differently in Online + if (comphelper::LibreOfficeKit::isActive()) + return OUString(); + bool bCtrlClickHlink = SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::CtrlClickHyperlink); // "ctrl-click to follow link:" for not MacOS |