[Libreoffice-commits] core.git: 2 commits - desktop/source include/LibreOfficeKit libreofficekit/source

[Pranav Kant]

 desktop/source/lib/init.cxx                |    5 +++++
 include/LibreOfficeKit/LibreOfficeKitGtk.h |    6 ++----
 libreofficekit/source/gtk/lokdocview.cxx   |   22 ++++++++++++++--------
 3 files changed, 21 insertions(+), 12 deletions(-)

New commits:
commit 169b9264f4c8b6a64ea445766b3f7e18cfee1eb0
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Jan 8 22:39:23 2018 +0530

    lokdialog: Enable input before posting mouse events
    
    Change-Id: Ib878544cf902aa3c12c59e4c7be6fff20d3a91a9

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f8aebcfc8606..ae0a99b8424f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2447,6 +2447,11 @@ static void doc_postWindowMouseEvent(LibreOfficeKitDocument* /*pThis*/, unsigned
     Point aPos(nX, nY);
     MouseEvent aEvent(aPos, nCount, MouseEventModifiers::SIMPLECLICK, nButtons, nModifier);
 
+    if (Dialog* pDialog = dynamic_cast<Dialog*>(pWindow.get()))
+    {
+        pDialog->EnableInput();
+    }
+
     switch (nType)
     {
         case LOK_MOUSEEVENT_MOUSEBUTTONDOWN:
commit 9b47049bfaa40ab5eea6f69ad0abc7b771ea8fe9
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Dec 22 14:50:52 2017 +0530

    lokdocview: Make g-ir-compiler, scanner happy
    
    Silence their warnings
    
    Change-Id: Id397745bbf7fe6687b60eeca60d5a0b67da421b1

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index dd35505e2b86..fb18aae8aab6 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -90,8 +90,6 @@ GtkWidget*                     lok_doc_view_new_from_widget        (LOKDocView*
  * @cancellable:
  * @callback:
  * @userdata:
- *
- * Returns: %TRUE if the document is loaded successfully, %FALSE otherwise
  */
 void                           lok_doc_view_open_document          (LOKDocView* pDocView,
                                                                     const gchar* pPath,
@@ -136,7 +134,7 @@ void                           lok_doc_view_set_zoom               (LOKDocView*
 /**
  * lok_doc_view_set_visible_area:
  * @pDocView: The #LOKDocView instance
- * @fZoom: The new visible area of pDocView in twips.
+ * @pVisibleArea: The new visible area of pDocView in twips.
  *
  * Sets the new visible area of the widget. This helps e.g. the page down key
  * to jump the correct length, which depends on the amount of visible height of
@@ -308,7 +306,7 @@ gboolean                        lok_doc_view_paste                 (LOKDocView*
 /**
  * lok_doc_view_set_document_password:
  * @pDocView: The #LOKDocView instance
- * @pUrl: the URL of the document to set password for, as sent with signal `password-required`
+ * @pURL: the URL of the document to set password for, as sent with signal `password-required`
  * @pPassword: (nullable) (allow-none): the password, NULL for no password
  *
  * Set the password for password protected documents
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index ca4e2433c43a..a4bf0c64f3b5 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -3205,7 +3205,9 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
                      G_TYPE_STRING);
 
     /**
-     * The key ruler related properties on change are reported by this.
+     * LOKDocView::ruler:
+     * @pDocView: the #LOKDocView on which the signal is emitted
+     * @pPayload: the JSON string contaning the information about ruler properties
      *
      * The payload format is:
      *
@@ -3217,8 +3219,6 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
      *      "pageWidth": "...",
      *      "unit": "..."
      *  }
-     *
-     * Here all aproperties are same as described in svxruler.
      */
     doc_view_signals[RULER] =
         g_signal_new("ruler",
@@ -3231,10 +3231,13 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
                      G_TYPE_STRING);
 
     /**
-     * Window related callbacks are emitted under this category. It includes
-     * external windows like dialogs, autopopups for now.
+     * LOKDocView::window::
+     * @pDocView: the #LOKDocView on which the signal is emitted
+     * @pPayload: the JSON string containing the information about the window
      *
-     * The payload format is:
+     * This signal emits information about external windows like dialogs, autopopups for now.
+     *
+     * The payload format of pPayload is:
      *
      * {
      *    "id": "unique integer id of the dialog",
@@ -3269,11 +3272,14 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
                      G_TYPE_STRING);
 
     /**
+     * LOKDocView::invalidate-header::
+     * @pDocView: the #LOKDocView on which the signal is emitted
+     * @pPayload: can be either "row", "column", or "all".
+     *
      * The column/row header is no more valid because of a column/row insertion
      * or a similar event. Clients must query a new column/row header set.
      *
-     * The payload says if we are invalidating a row or column header. So,
-     * payload values can be: "row", "column", "all".
+     * The payload says if we are invalidating a row or column header
      */
     doc_view_signals[INVALIDATE_HEADER] =
         g_signal_new("invalidate-header",