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.behrens@allotropia.de> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
This commit is contained in:
@@ -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">
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -397,12 +397,6 @@ interface BaseText
|
||||
[
|
||||
StateMethod = StateInsert ;
|
||||
]
|
||||
FN_INSERT_HYPERLINK // status()
|
||||
[
|
||||
ExecMethod = Execute ;
|
||||
StateMethod = GetState;
|
||||
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
|
||||
]
|
||||
SID_HYPERLINK_DIALOG
|
||||
[
|
||||
ExecMethod = Execute ;
|
||||
|
||||
@@ -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
|
||||
()
|
||||
[
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user