[Libreoffice-commits] core.git: include/svx officecfg/registry svx/sdi sw/inc sw/sdi sw/source
Samuel Mehrbrodt (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 6 10:30:47 UTC 2019
include/svx/svxids.hrc | 3 +
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5 ++
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 5 --
svx/sdi/svx.sdi | 17 +++++++++
sw/inc/cmdid.h | 2 -
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 | 6 +--
10 files changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 80089fb50eb73d32ddb035370b9389a3e270b5ed
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Aug 6 11:27:41 2019 +0200
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Aug 6 12:29:54 2019 +0200
Move CopyHyperlinkLocation to svx
so that it can be used by other modules too
Change-Id: I43d197320f85a3ec06b6b0b832f7bb5647800076
Reviewed-on: https://gerrit.libreoffice.org/77012
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index d430f6de692f..06bec32a4869 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -984,9 +984,10 @@ class SvxSetItem;
#define SID_INSERT_QRCODE ( SID_SVX_START + 1191 )
#define SID_EDIT_QRCODE ( SID_SVX_START + 1192 )
+#define SID_COPY_HYPERLINK_LOCATION ( SID_SVX_START + 1193 )
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE ( SID_SVX_START + 1192 + 1 )
+#define SID_SVX_FIRSTFREE ( SID_SVX_START + 1193 + 1 )
// Overflow check for slot IDs
#if SID_SVX_FIRSTFREE > SID_SVX_END
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 8d2235d198c1..d3f803d91024 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3275,6 +3275,11 @@
<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>
+ </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 ceb080325408..f17b8f122128 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -446,11 +446,6 @@
<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>
- </prop>
- </node>
<node oor:name=".uno:InsertBookmark" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Bookmar~k...</value>
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 1c62757707dc..22912965caa5 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -12083,6 +12083,23 @@ SfxVoidItem RemoveHyperlink SID_REMOVE_HYPERLINK
GroupId = SfxGroupId::Edit;
]
+SfxVoidItem CopyHyperlinkLocation SID_COPY_HYPERLINK_LOCATION
+[
+ AutoUpdate = FALSE,
+ FastCall = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ ToolBoxConfig = TRUE,
+ GroupId = SfxGroupId::Edit;
+]
+
SfxVoidItem InsertQrCode SID_INSERT_QRCODE
()
[
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index ecbb368ca66c..e442239e8fd2 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -136,7 +136,7 @@
#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*/
// free
-#define FN_COPY_HYPERLINK_LOCATION (FN_EDIT2 + 40) /* copy hyperlink URL to clipboard */
+// free
#define FN_REDLINE_NEXT_CHANGE (FN_EDIT2 + 41) /* Go to the next change */
#define FN_REDLINE_PREV_CHANGE (FN_EDIT2 + 42) /* Go to the previous change */
#define FN_REDLINE_ACCEPT_ALL (FN_EDIT2 + 43) /* Redlining Accept All*/
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 04e686813c58..9abad60e8197 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -353,7 +353,7 @@ interface BaseText
StateMethod = GetState;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
- FN_COPY_HYPERLINK_LOCATION
+ SID_COPY_HYPERLINK_LOCATION
[
ExecMethod = Execute ;
StateMethod = GetState;
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 259ed1e8be66..5e3f4ed3fa19 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -564,7 +564,7 @@ interface TextDrawText
StateMethod = GetState;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
- FN_COPY_HYPERLINK_LOCATION
+ SID_COPY_HYPERLINK_LOCATION
[
ExecMethod = Execute ;
StateMethod = GetState;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 8604e2b8c318..02bdbd961d4c 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -7328,24 +7328,6 @@ SfxVoidItem PreviousTrackedChange FN_REDLINE_PREV_CHANGE
GroupId = SfxGroupId::Edit;
]
-SfxVoidItem CopyHyperlinkLocation FN_COPY_HYPERLINK_LOCATION
-[
- AutoUpdate = FALSE,
- FastCall = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
-
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
- GroupId = SfxGroupId::Edit;
-]
-
SfxVoidItem NavigateBack FN_NAVIGATION_BACK
[
AutoUpdate = TRUE,
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index e802654a7717..2f5ae1a43019 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -517,7 +517,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
}
break;
- case FN_COPY_HYPERLINK_LOCATION:
+ case SID_COPY_HYPERLINK_LOCATION:
{
const SvxFieldData* pField = pOLV->GetFieldAtCursor();
if (const SvxURLField* pURLField = dynamic_cast<const SvxURLField*>(pField))
@@ -931,7 +931,7 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
case SID_REMOVE_HYPERLINK:
case SID_EDIT_HYPERLINK:
case SID_OPEN_HYPERLINK:
- case FN_COPY_HYPERLINK_LOCATION:
+ case SID_COPY_HYPERLINK_LOCATION:
{
if (!URLFieldHelper::IsCursorAtURLField(pOLV))
rSet.DisableItem(nWhich);
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 85ea8091aee5..841ca6e315f7 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1301,7 +1301,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
}
break;
case SID_OPEN_HYPERLINK:
- case FN_COPY_HYPERLINK_LOCATION:
+ case SID_COPY_HYPERLINK_LOCATION:
{
SfxItemSet aSet(GetPool(),
svl::Items<RES_TXTATR_INETFMT,
@@ -1310,7 +1310,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if(SfxItemState::SET <= aSet.GetItemState( RES_TXTATR_INETFMT ))
{
const SwFormatINetFormat& rINetFormat = dynamic_cast<const SwFormatINetFormat&>( aSet.Get(RES_TXTATR_INETFMT) );
- if( nSlot == FN_COPY_HYPERLINK_LOCATION )
+ if( nSlot == SID_COPY_HYPERLINK_LOCATION )
{
::uno::Reference< datatransfer::clipboard::XClipboard > xClipboard = GetView().GetEditWin().GetClipboard();
vcl::unohelper::TextDataObject::CopyStringTo(
@@ -1748,7 +1748,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
break;
case SID_EDIT_HYPERLINK:
- case FN_COPY_HYPERLINK_LOCATION:
+ case SID_COPY_HYPERLINK_LOCATION:
{
SfxItemSet aSet(GetPool(),
svl::Items<RES_TXTATR_INETFMT,
More information about the Libreoffice-commits
mailing list