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 f0cf85983d0b04a9889c45e26ce8fd9dc022fc89
Author: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
AuthorDate: Tue Oct 22 16:00:25 2024 +0300
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Fri Oct 25 15:40:41 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 <thorsten.behr...@allotropia.de>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index e2d06989c0f1..3e378f8a8f3b 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 6a2406c0a32a..395bf663deec 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -219,8 +219,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 8a37e74593e7..d5e25007ef13 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -397,12 +397,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 20a23b745338..ec808db28b46 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3152,24 +3152,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 8b5e0e56645d..0480aeaf2b20 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -210,9 +210,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);
@@ -1600,7 +1598,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 )
@@ -3329,7 +3326,6 @@ void SwTextShell::GetState( SfxItemSet &rSet )
}
break;
- case FN_INSERT_HYPERLINK:
case SID_INSERTDOC:
case FN_INSERT_GLOSSARY:
case FN_EXPAND_GLOSSARY:
