officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 3 + sw/inc/cmdid.h | 2 - sw/sdi/_textsh.sdi | 6 --- sw/sdi/swriter.sdi | 18 ---------- sw/source/uibase/shells/textsh1.cxx | 6 --- 5 files changed, 4 insertions(+), 31 deletions(-)
New commits: commit eb72179d040e92baeb3cb02cc1aa8a327b54cbda Author: Ilmari Lauhakangas <[email protected]> AuthorDate: Tue Oct 22 16:00:25 2024 +0300 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Fri Oct 25 17:54:05 2024 +0200 tdf#132253 tdf#163482 Use .uno:InsertHyperlinkDlg as alias to HyperlinkDialog. The purpose of the obsolete command was to open Character Formatting dialog with the Hyperlink tab focused. Change-Id: I8a3053a7bc7bd98c33224c0988d5c0994d4dca9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175412 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> Reviewed-by: Ilmari Lauhakangas <[email protected]> (cherry picked from commit f0cf85983d0b04a9889c45e26ce8fd9dc022fc89) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175610 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index c0fdc8887338..0db0891e8594 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -660,6 +660,9 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Insert Hyperlink</value> </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:HyperlinkDialog</value> + </prop> </node> <node oor:name=".uno:InsertLinebreak" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index c99e8da6d3f7..5fc521d3eddf 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -218,8 +218,6 @@ class SwUINumRuleItem; #define FN_INSERT_REF_FIELD (FN_INSERT + 13) /* Insert Reference Field */ -#define FN_INSERT_HYPERLINK (FN_INSERT + 14) /* Character dialogue / hyperlink page */ - #define FN_INSERT_LINEBREAK (FN_INSERT + 18) /* Newline */ #define FN_INSERT_FIELD_DATA_ONLY (FN_INSERT + 19) /* Field dialog for mail merge*/ #define FN_INSERT_CONTENT_CONTROL (FN_INSERT + 20) /* Rich text content control */ diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index fa5809bd29c0..810932876bee 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -393,12 +393,6 @@ interface BaseText [ StateMethod = StateInsert ; ] - FN_INSERT_HYPERLINK // status() - [ - ExecMethod = Execute ; - StateMethod = GetState; - DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; - ] SID_HYPERLINK_DIALOG [ ExecMethod = Execute ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index ed49dc200ed9..deee2b2ee0ae 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -3149,24 +3149,6 @@ SfxVoidItem InsertFrameInteractNoColumns FN_INSERT_FRAME_INTERACT_NOCOL GroupId = SfxGroupId::Insert; ] -SfxVoidItem InsertHyperlinkDlg FN_INSERT_HYPERLINK -() -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerItem; - Asynchron; - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = SfxGroupId::Insert; -] - SfxVoidItem InsertIndexesEntry FN_INSERT_IDX_ENTRY_DLG () [ diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 2ef36ff57c9a..5afb496f60e8 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -184,9 +184,7 @@ static void sw_CharDialog(SwWrtShell& rWrtSh, bool bUseDialog, bool bApplyToPara SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); pDlg.reset(pFact->CreateSwCharDlg(rWrtSh.GetView().GetFrameWeld(), rWrtSh.GetView(), *pCoreSet, SwCharDlgMode::Std)); - if (nSlot == FN_INSERT_HYPERLINK) - pDlg->SetCurPageId(u"hyperlink"_ustr); - else if (nSlot == SID_CHAR_DLG_EFFECT) + if (nSlot == SID_CHAR_DLG_EFFECT) pDlg->SetCurPageId(u"fonteffects"_ustr); else if (nSlot == SID_CHAR_DLG_POSITION) pDlg->SetCurPageId(u"position"_ustr); @@ -1464,7 +1462,6 @@ void SwTextShell::Execute(SfxRequest &rReq) case SID_ATTR_CHAR_SCALEWIDTH : case SID_ATTR_CHAR_ROTATED : case FN_TXTATR_INET : - case FN_INSERT_HYPERLINK: { const sal_uInt16 nWhich = GetPool().GetWhichIDFromSlotID( nSlot ); if ( pArgs && pArgs->GetItemState( nWhich ) == SfxItemState::SET ) @@ -2376,7 +2373,6 @@ void SwTextShell::GetState( SfxItemSet &rSet ) } break; - case FN_INSERT_HYPERLINK: case SID_INSERTDOC: case FN_INSERT_GLOSSARY: case FN_EXPAND_GLOSSARY:
