mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deduplicate EditHyperlink command

Browse Source 
Change-Id: I23f0c276c5c1229aeb4ea468c6b858e36c120bd9
Reviewed-on: https://gerrit.libreoffice.org/75480
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Samuel Mehrbrodt
2019-07-12 11:01:56 +02:00
parent 86cb2a1f98
commit ae68e12e0f
15 changed files with 41 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/svx/svxcommands.h
View File

@@ -117,6 +117,7 @@
#define CMD_SID_ATTR_CHAR_OVERLINE ".uno:Overline"
#define CMD_SID_3D_WIN ".uno:Window3D"
#define CMD_SID_OPEN_HYPERLINK ".uno:OpenHyperlinkOnCursor"
#define CMD_SID_EDIT_HYPERLINK ".uno:EditHyperlink"
#define CMD_SID_TABLE_MERGE_CELLS ".uno:MergeCells"
#define CMD_SID_TABLE_SPLIT_CELLS ".uno:SplitCell"
#define CMD_SID_TABLE_VERT_BOTTOM ".uno:CellVertBottom"

2
include/svx/svxids.hrc
View File

@@ -762,7 +762,7 @@ class SvxSetItem;
#define SID_EXTRUSION_SURFACE ( SID_SVX_START + 975 )
#define SID_EXTRUSION_DEPTH_DIALOG ( SID_SVX_START + 976 )
#define SID_FONTWORK_GALLERY_FLOATER ( SID_SVX_START + 977 )
// free ( SID_SVX_START + 978 )
#define SID_EDIT_HYPERLINK ( SID_SVX_START + 978 )
#define SID_FONTWORK_SHAPE_TYPE ( SID_SVX_START + 979 )
#define SID_FONTWORK_SAME_LETTER_HEIGHTS ( SID_SVX_START + 980 )
#define SID_FONTWORK_ALIGNMENT_FLOATER ( SID_SVX_START + 981 )

11
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
View File

@@ -699,17 +699,6 @@
<value>1</value>
</prop>
</node>
<node oor:name=".uno:EditHyperlink" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Hyperlink...</value>
</prop>
<prop oor:name="PopupLabel" oor:type="xs:string">
<value xml:lang="en-US">Edit Hyperlink...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
<node oor:name=".uno:HideLastLevel" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Hide Last Level</value>

11
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
View File

@@ -3264,6 +3264,17 @@
<value>1</value>
</prop>
</node>
<node oor:name=".uno:EditHyperlink" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Hyperlink</value>
</prop>
<prop oor:name="PopupLabel" oor:type="xs:string">
<value xml:lang="en-US">Edit Hyperlink...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
<node oor:name=".uno:OpenSmartTagMenuOnCursor" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Smart Tags</value>

11
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
View File

@@ -446,17 +446,6 @@
<value>1</value>
</prop>
</node>
<node oor:name=".uno:EditHyperlink" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Hyperlink</value>
</prop>
<prop oor:name="PopupLabel" oor:type="xs:string">
<value xml:lang="en-US">Edit Hyperlink...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
<node oor:name=".uno:CopyHyperlinkLocation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Copy Hyperlink Location</value>

2
sd/inc/app.hrc
View File

@@ -400,7 +400,7 @@
#define SID_CONVERT_TO_METAFILE (SID_SD_START+379)
// FREE
#define SID_CONVERT_TO_CONTOUR (SID_SD_START+381)
#define SID_EDIT_HYPERLINK (SID_SD_START+382)
// FREE
#define ID_VAL_DUMMY1 (SID_SD_START+383)
#define ID_VAL_DUMMY2 (SID_SD_START+384)
#define ID_VAL_DUMMY3 (SID_SD_START+385)

17
sd/sdi/sdraw.sdi
View File

@@ -1319,23 +1319,6 @@ SfxVoidItem DuplicatePage SID_DUPLICATE_PAGE
GroupId = SfxGroupId::Insert;
]
SfxVoidItem EditHyperlink SID_EDIT_HYPERLINK
()
[
AutoUpdate = FALSE,
FastCall = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
AccelConfig = FALSE,
MenuConfig = TRUE,
ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Edit;
]
SfxVoidItem EditOutline SID_EDIT_OUTLINER
()
[

18
svx/sdi/svx.sdi
View File

@@ -9362,6 +9362,24 @@ SfxVoidItem OpenHyperlinkOnCursor SID_OPEN_HYPERLINK
GroupId = SfxGroupId::Edit;
]
SfxVoidItem EditHyperlink SID_EDIT_HYPERLINK
()
[
AutoUpdate = FALSE,
FastCall = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerItem;
Asynchron;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
GroupId = SfxGroupId::Edit;
]
SfxBoolItem CTLFontState SID_CTLFONT_STATE
[
AutoUpdate = FALSE,

3
sw/inc/cmdid.h
View File

@@ -131,8 +131,7 @@
#define FN_EDIT_CURRENT_TOX (FN_EDIT2 + 32) /* edit current index */
#define FN_EDIT_AUTH_ENTRY_DLG (FN_EDIT2 + 33) /* edit authorities entry*/
#define FN_UPDATE_CHARTS (FN_EDIT2 + 34) /* update all charts */
#define FN_EDIT_HYPERLINK (FN_EDIT2 + 35) /* edit hyperlink */
// free
#define FN_NUM_CONTINUE (FN_EDIT2 + 36) /* continue previous numbering */
#define FN_REDLINE_ACCEPT_DIRECT (FN_EDIT2 + 37) /* accept redline at current position*/
#define FN_REDLINE_REJECT_DIRECT (FN_EDIT2 + 38) /* reject redline at current position*/

2
sw/sdi/_textsh.sdi
View File

@@ -341,7 +341,7 @@ interface BaseText
ExecMethod = Execute ;
StateMethod = GetState;
]
FN_EDIT_HYPERLINK
SID_EDIT_HYPERLINK
[
ExecMethod = Execute ;
StateMethod = GetState;

2
sw/sdi/drwtxtsh.sdi
View File

@@ -546,7 +546,7 @@ interface TextDrawText
[
StateMethod = StateInsert ;
]
FN_EDIT_HYPERLINK
SID_EDIT_HYPERLINK
[
ExecMethod = Execute ;
StateMethod = GetState;

18
sw/sdi/swriter.sdi
View File

@@ -1052,24 +1052,6 @@ SfxVoidItem EditGlossary FN_GLOSSARY_DLG
GroupId = SfxGroupId::Edit;
]
SfxVoidItem EditHyperlink FN_EDIT_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 EditRegion FN_EDIT_REGION
()
[

4
sw/source/uibase/shells/drwtxtex.cxx
View File

@@ -486,7 +486,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
}
break;
case FN_EDIT_HYPERLINK:
case SID_EDIT_HYPERLINK:
{
// Ensure the field is selected first
pOLV->GetFieldAtCursor();
@@ -901,7 +901,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
}
break;
case FN_REMOVE_HYPERLINK:
case FN_EDIT_HYPERLINK:
case SID_EDIT_HYPERLINK:
{
if (!URLFieldHelper::IsCursorAtURLField(pOLV))
rSet.DisableItem(nWhich);

4
sw/source/uibase/shells/textsh1.cxx
View File

@@ -882,7 +882,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
rWrtSh.UnProtectTables();
}
break;
case FN_EDIT_HYPERLINK:
case SID_EDIT_HYPERLINK:
GetView().GetViewFrame()->SetChildWindow(SID_HYPERLINK_DIALOG, true);
break;
case FN_REMOVE_HYPERLINK:
@@ -1746,7 +1746,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
}
break;
case FN_EDIT_HYPERLINK:
case SID_EDIT_HYPERLINK:
case FN_COPY_HYPERLINK_LOCATION:
{
SfxItemSet aSet(GetPool(),

3
sw/source/uibase/utlui/content.cxx
View File

@@ -72,6 +72,7 @@
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdview.hxx>
#include <svx/svxids.hrc>
#include <vcl/scrbar.hxx>
#include <SwRewriter.hxx>
#include <hints.hxx>
@@ -3522,7 +3523,7 @@ void SwContentTree::EditEntry(SvTreeListEntry const * pEntry, EditEntryMode nMod
break;
case ContentTypeId::URLFIELD:
nSlot = FN_EDIT_HYPERLINK;
nSlot = SID_EDIT_HYPERLINK;
break;
case ContentTypeId::REFERENCE:
nSlot = FN_EDIT_FIELD;