diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2014-04-29 11:08:48 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2014-04-29 11:11:53 +0200 |
commit | d46e7dabd3090697c46e24a350cc75f35c28a8f7 (patch) | |
tree | 8be57234466b19a3b7c787b538d21ff6ee28b7cb /sw/inc | |
parent | 839d7f9c59f7778db5b785af56071f92657777e4 (diff) |
do not have a separate action for accepting changes in a selection
It doesn't really make sense to have two different UI elements, one
for a change that cursor points at and one for all changes in a selection,
as it's always either one or the other, so just keep the one UI element
and do the right thing internally.
So this reverts a part of 4a60f9387ddd832f7c164102b76351e5e520d920.
Change-Id: Ic94a7704cbbc6273e91b0ee478f6304019220c4d
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/cmdid.h | 2 | ||||
-rw-r--r-- | sw/inc/swcommands.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 721b3f4b6009..8f4967585d0d 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -163,8 +163,6 @@ #define FN_COPY_HYPERLINK_LOCATION (FN_EDIT2 + 40) /* copy hyperlink URL to clipboard */ #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_DIRECT_SELECTION (FN_EDIT2 + 43) /* accept redlines in the selection */ -#define FN_REDLINE_REJECT_DIRECT_SELECTION (FN_EDIT2 + 44) /* reject redlines in the selection */ /*-------------------------------------------------------------------- Region: Edit diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h index aa580e31e7b0..cc9bc07d0f42 100644 --- a/sw/inc/swcommands.h +++ b/sw/inc/swcommands.h @@ -122,8 +122,6 @@ #define CMD_FN_HIDE_ALL_NOTES ".uno:HideAllNotes" #define CMD_FN_REDLINE_ACCEPT_DIRECT ".uno:AcceptTracedChange" #define CMD_FN_REDLINE_REJECT_DIRECT ".uno:RejectTracedChange" -#define CMD_FN_REDLINE_ACCEPT_DIRECT_SELECTION ".uno:AcceptTracedChangesInSelection" -#define CMD_FN_REDLINE_REJECT_DIRECT_SELECTION ".uno:RejectTracedChangesInSelection" #define CMD_FN_REDLINE_NEXT_CHANGE ".uno:NextTrackedChange" #define CMD_FN_REDLINE_PREV_CHANGE ".uno:PreviousTrackedChange" #define CMD_FN_REMOVE_HYPERLINK ".uno:RemoveHyperlink" |