[Libreoffice-commits] core.git: libreofficekit/qa

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   21 +++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 3ab6e2783bf7142729924cb95ca730404d0c54e1
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Jan 6 14:26:53 2017 +0530

    gtktiledviewer: Support for posting arguments to uno commands
    
    Change-Id: I5db217b525d0f976ef6a7840e370f8f6a21d60cb
    Reviewed-on: https://gerrit.libreoffice.org/32772
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 27c8e43..2f75a65 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -121,6 +121,7 @@ public:
     GtkWidget* m_pFormulabarEntry;
     GtkWidget* m_pScrolledWindow;
     std::map<GtkToolItem*, std::string> m_aToolItemCommandNames;
+    std::map<GtkToolItem*, std::string> m_aToolItemCommandArgs;
     std::map<std::string, GtkToolItem*> m_aCommandNameToolItems;
     /// Sensitivity (enabled or disabled) or each tool item, ignoring edit
     /// state.
@@ -209,6 +210,14 @@ static std::string getNextAuthor()
     return std::string(pPasswd->pw_gecos) + " #" + std::to_string(++nCounter);
 }
 
+static void lcl_registerToolItem(TiledWindow& rWindow, GtkToolItem* pItem, const std::string& rName, const std::string& rArgs = "")
+{
+    rWindow.m_aToolItemCommandNames[pItem] = rName;
+    rWindow.m_aToolItemCommandArgs[pItem] = rArgs;
+    rWindow.m_aCommandNameToolItems[rName] = pItem;
+    rWindow.m_aToolItemSensitivities[pItem] = true;
+}
+
 TiledRowColumnBar::TiledRowColumnBar(TiledBarType eType)
     : m_pDrawingArea(gtk_drawing_area_new()),
     m_nSizePixel(0),
@@ -396,13 +405,6 @@ gboolean TiledCornerButton::drawImpl(GtkWidget* /*pWidget*/, cairo_t* pCairo)
     return FALSE;
 }
 
-static void lcl_registerToolItem(TiledWindow& rWindow, GtkToolItem* pItem, const std::string& rName)
-{
-    rWindow.m_aToolItemCommandNames[pItem] = rName;
-    rWindow.m_aCommandNameToolItems[rName] = pItem;
-    rWindow.m_aToolItemSensitivities[pItem] = true;
-}
-
 const float fZooms[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, 5.0 };
 
 static void iterateUnoParams(GtkWidget* pWidget, gpointer userdata)
@@ -1332,12 +1334,13 @@ static void toggleToolItem(GtkWidget* pWidget, gpointer /*pData*/)
         LOKDocView* pLOKDocView = LOK_DOC_VIEW(rWindow.m_pDocView);
         GtkToolItem* pItem = GTK_TOOL_ITEM(pWidget);
         const std::string& rString = rWindow.m_aToolItemCommandNames[pItem];
-        g_info("toggleToolItem: lok_doc_view_post_command('%s')", rString.c_str());
+        const std::string& rArguments = rWindow.m_aToolItemCommandArgs[pItem];
+        g_info("toggleToolItem: lok_doc_view_post_command('%s %s')", rString.c_str(), rArguments.c_str());
 
         // notify about the finished Save
         gboolean bNotify = (rString == ".uno:Save");
 
-        lok_doc_view_post_command(pLOKDocView, rString.c_str(), /*pArguments=*/nullptr, bNotify);
+        lok_doc_view_post_command(pLOKDocView, rString.c_str(), rArguments.c_str(), bNotify);
     }
 }