[Libreoffice-commits] core.git: include/svx officecfg/registry sd/inc sd/sdi svx/sdi sw/inc sw/sdi sw/source
Samuel Mehrbrodt (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jul 15 06:55:24 UTC 2019
include/svx/svxcommands.h | 1
include/svx/svxids.hrc | 2 -
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 11 ------
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 11 ++++++
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 11 ------
sd/inc/app.hrc | 2 -
sd/sdi/sdraw.sdi | 17 ---------
svx/sdi/svx.sdi | 18 ++++++++++
sw/inc/cmdid.h | 3 -
sw/sdi/_textsh.sdi | 2 -
sw/sdi/drwtxtsh.sdi | 2 -
sw/sdi/swriter.sdi | 18 ----------
sw/source/uibase/shells/drwtxtex.cxx | 4 +-
sw/source/uibase/shells/textsh1.cxx | 4 +-
sw/source/uibase/utlui/content.cxx | 3 +
15 files changed, 41 insertions(+), 68 deletions(-)
New commits:
commit ae68e12e0fcb9372e59b7071a37650df06175d5a
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Fri Jul 12 11:01:56 2019 +0200
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Mon Jul 15 08:54:25 2019 +0200
Deduplicate EditHyperlink command
Change-Id: I23f0c276c5c1229aeb4ea468c6b858e36c120bd9
Reviewed-on: https://gerrit.libreoffice.org/75480
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index 4e5453ffa6fd..0c1a6ffabf41 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -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"
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index b43c475f90be..75616d40e128 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -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 )
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 8199dc07e72e..2facd9bee872 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -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>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 44654837f894..52169ed4234b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -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>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index df8fb4f821b2..ceb080325408 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -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>
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 1ca6952d9ba4..2738085f0ae5 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -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)
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 50bb4ce436de..b1760f31bb3b 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -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
()
[
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 6e9b07be15dc..a7c15fb4d701 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -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,
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 0a8191ce59bd..d32dd420f25b 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -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*/
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 7884565ad03a..badcf400da79 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -341,7 +341,7 @@ interface BaseText
ExecMethod = Execute ;
StateMethod = GetState;
]
- FN_EDIT_HYPERLINK
+ SID_EDIT_HYPERLINK
[
ExecMethod = Execute ;
StateMethod = GetState;
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index c5a0e6477c0e..721366fdb65b 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -546,7 +546,7 @@ interface TextDrawText
[
StateMethod = StateInsert ;
]
- FN_EDIT_HYPERLINK
+ SID_EDIT_HYPERLINK
[
ExecMethod = Execute ;
StateMethod = GetState;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 6e04a0a0884f..f39cf515fa6a 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -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
()
[
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 898cc8743fe5..0125738fb745 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -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);
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index d39c4d89c113..c014949ab25e 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -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(),
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index e728024d1c7a..ae42953cf7f3 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -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;
More information about the Libreoffice-commits
mailing list