diff options
author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-11-17 08:57:09 +0000 |
---|---|---|
committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-12-07 00:48:10 +0100 |
commit | 8dac6878119178a45d2ded9ddd584499b77cc26a (patch) | |
tree | 2c04146ecc4995df5e61bd12723346b0f96032ff | |
parent | aef0d7ee630aee82eb2c52f9cc89197dd5cafd52 (diff) |
we can have just one LoadURL for writer
Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d)
-rw-r--r-- | sw/inc/swurl.hxx | 5 | ||||
-rw-r--r-- | sw/source/uibase/shells/drwtxtex.cxx | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx index ec88a639a4e9..87375f30c8b7 100644 --- a/sw/inc/swurl.hxx +++ b/sw/inc/swurl.hxx @@ -23,7 +23,6 @@ #include <o3tl/typed_flags_set.hxx> class SwViewShell; -class SwView; enum class LoadUrlFlags { NONE = 0x00, @@ -36,10 +35,6 @@ namespace o3tl { void LoadURL( SwViewShell& rSh, const OUString& rName, LoadUrlFlags nFilter, const OUString& rTargetFrameName ); -void LoadURL( SwView& rView, const OUString& rName, - LoadUrlFlags nFilter, const OUString& rTargetFrameName ); - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 820b131e60b6..0e3ba07c3973 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) const SvxFieldData* pField = pOLV->GetFieldAtCursor(); if (const SvxURLField* pURLField = dynamic_cast<const SvxURLField*>(pField)) { - ::LoadURL(GetView(), pURLField->GetURL(), LoadUrlFlags::NONE, + ::LoadURL(GetShell(), pURLField->GetURL(), LoadUrlFlags::NONE, pURLField->GetTargetFrame()); } } |