summaryrefslogtreecommitdiffstats
path: root/libreofficekit
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-08-19 16:46:15 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-08-19 16:51:36 +0200
commit9e310a4705ce956551059040696166aefb2388cb (patch)
tree55ed66cdf30ddcfa03ea44ce7f3555d63b859aa6 /libreofficekit
parentpShell can be null here (diff)
downloadcore-9e310a4705ce956551059040696166aefb2388cb.tar.gz
core-9e310a4705ce956551059040696166aefb2388cb.zip
sw redlines: expose description as part of the UNO/LOK API
A redline can have a manual comment and also an autogenerated description, like "Insert 'abc'". Expose this later property as well, as it provides useful additional information, especially when the comment property is empty. Change-Id: Id0f0ff62aef58d96b9b6071706c6f5b4a0d74800
Diffstat (limited to 'libreofficekit')
-rw-r--r--libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 5a134d02a599..9bfaa85a8002 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -485,7 +485,7 @@ static void documentRedline(GtkWidget* pButton, gpointer /*pItem*/)
GtkWidget* pContentArea = gtk_dialog_get_content_area(GTK_DIALOG (pDialog));
// Build the table.
- GtkTreeStore* pTreeStore = gtk_tree_store_new(5, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+ GtkTreeStore* pTreeStore = gtk_tree_store_new(6, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
for (const auto& rValue : aTree.get_child("redlines"))
{
GtkTreeIter aTreeIter;
@@ -495,11 +495,12 @@ static void documentRedline(GtkWidget* pButton, gpointer /*pItem*/)
1, rValue.second.get<std::string>("author").c_str(),
2, rValue.second.get<std::string>("type").c_str(),
3, rValue.second.get<std::string>("comment").c_str(),
- 4, rValue.second.get<std::string>("dateTime").c_str(),
+ 4, rValue.second.get<std::string>("description").c_str(),
+ 5, rValue.second.get<std::string>("dateTime").c_str(),
-1);
}
GtkWidget* pTreeView = gtk_tree_view_new_with_model(GTK_TREE_MODEL(pTreeStore));
- std::vector<std::string> aColumns = {"Index", "Author", "Type", "Comment", "Timestamp"};
+ std::vector<std::string> aColumns = {"Index", "Author", "Type", "Comment", "Description", "Timestamp"};
for (size_t nColumn = 0; nColumn < aColumns.size(); ++nColumn)
{
GtkCellRenderer* pRenderer = gtk_cell_renderer_text_new();