summaryrefslogtreecommitdiff
path: root/libreofficekit
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-09-15 16:04:05 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-09-15 17:03:25 +0200
commit84e91157c674b0b78b792fc1d4f841fe50b1dd9b (patch)
treedb214e7e289c292ca3af31af086e4a4adc963376 /libreofficekit
parent5518de780519ad95d2079d21255de3edf20879f3 (diff)
sw: allow select of redline by index
Previously .uno:NextTrackedChange always worked by cursor position, but redlines are stored in the redline table, so they have a unique index. Allow specifying that index when invoking the command, and in that case ignore the cursor position. Change-Id: I7dbe8044feca8fcc48635482a22317b024f40ffa
Diffstat (limited to 'libreofficekit')
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 97b3350f34aa..2576f9904ff7 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -482,6 +482,8 @@ static void documentRedline(GtkWidget* pButton, gpointer /*pItem*/)
GTK_RESPONSE_YES,
"Reject",
GTK_RESPONSE_NO,
+ "Jump",
+ GTK_RESPONSE_APPLY,
nullptr);
GtkWidget* pContentArea = gtk_dialog_get_content_area(GTK_DIALOG (pDialog));
@@ -518,7 +520,7 @@ static void documentRedline(GtkWidget* pButton, gpointer /*pItem*/)
gint res = gtk_dialog_run(GTK_DIALOG(pDialog));
// Dispatch the matching command, if necessary.
- if (res == GTK_RESPONSE_YES || res == GTK_RESPONSE_NO)
+ if (res == GTK_RESPONSE_YES || res == GTK_RESPONSE_NO || res == GTK_RESPONSE_APPLY)
{
GtkTreeSelection* pSelection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pTreeView));
GtkTreeIter aTreeIter;
@@ -531,8 +533,11 @@ static void documentRedline(GtkWidget* pButton, gpointer /*pItem*/)
std::string aCommand;
if (res == GTK_RESPONSE_YES)
aCommand = ".uno:AcceptTrackedChange";
- else
+ else if (res == GTK_RESPONSE_NO)
aCommand = ".uno:RejectTrackedChange";
+ else
+ // Just select the given redline, don't accept or reject it.
+ aCommand = ".uno:NextTrackedChange";
// Without the '.uno:' prefix.
std::string aKey = aCommand.substr(strlen(".uno:"));