[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/LibreOfficeKit libreofficekit/source

[Pranav Kant]

 include/LibreOfficeKit/LibreOfficeKitGtk.h |   12 ++++++------
 libreofficekit/source/gtk/lokdocview.cxx   |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 0886f49224064a259ed6615961f420ab7b6fc3ef
Author: Pranav Kant <pranavk at libreoffice.org>
Date:   Thu Dec 17 20:35:23 2015 +0530

    lokdocview: Use GLib basic types
    
    Change-Id: I07add7b9dcb1dc53d7ed61ff71545489de3be155
    Reviewed-on: https://gerrit.libreoffice.org/20778
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit b902432b431d01634c1f56e4758ec236a999650d)
    Reviewed-on: https://gerrit.libreoffice.org/21265
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Pranav Kant <pranavk at gnome.org>

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 903a742..c3cba8f 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -118,19 +118,19 @@ void                           lok_doc_view_set_zoom               (LOKDocView*
  *
  * Returns: The current zoom factor value in float for pDocView
  */
-float                          lok_doc_view_get_zoom               (LOKDocView* pDocView);
+gfloat                         lok_doc_view_get_zoom               (LOKDocView* pDocView);
 
 /**
  * lok_doc_view_get_parts:
  * @pDocView: The #LOKDocView instance
  */
-int                            lok_doc_view_get_parts              (LOKDocView* pDocView);
+gint                           lok_doc_view_get_parts              (LOKDocView* pDocView);
 
 /**
  * lok_doc_view_get_part:
  * @pDocView: The #LOKDocView instance
  */
-int                            lok_doc_view_get_part               (LOKDocView* pDocView);
+gint                           lok_doc_view_get_part               (LOKDocView* pDocView);
 
 /**
  * lok_doc_view_set_part:
@@ -145,7 +145,7 @@ void                           lok_doc_view_set_part               (LOKDocView*
  * @pDocView: The #LOKDocView instance
  * @nPart:
  */
-char*                          lok_doc_view_get_part_name          (LOKDocView* pDocView,
+gchar*                         lok_doc_view_get_part_name          (LOKDocView* pDocView,
                                                                     int nPart);
 
 /**
@@ -272,7 +272,7 @@ gboolean                        lok_doc_view_paste                 (LOKDocView*
  *
  * Returns: The corresponding value in twips
  */
-float                          lok_doc_view_pixel_to_twip          (LOKDocView* pDocView,
+gfloat                         lok_doc_view_pixel_to_twip          (LOKDocView* pDocView,
                                                                     float fInput);
 
 /**
@@ -284,7 +284,7 @@ float                          lok_doc_view_pixel_to_twip          (LOKDocView*
  *
  * Returns: The corresponding value in pixels
  */
-float                          lok_doc_view_twip_to_pixel          (LOKDocView* pDocView,
+gfloat                         lok_doc_view_twip_to_pixel          (LOKDocView* pDocView,
                                                                     float fInput);
 
 G_END_DECLS
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 16e13e1..eb20aab 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2509,14 +2509,14 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
     g_object_unref(task);
 }
 
-SAL_DLLPUBLIC_EXPORT float
+SAL_DLLPUBLIC_EXPORT gfloat
 lok_doc_view_get_zoom (LOKDocView* pDocView)
 {
     LOKDocViewPrivate& priv = getPrivate(pDocView);
     return priv->m_fZoom;
 }
 
-SAL_DLLPUBLIC_EXPORT int
+SAL_DLLPUBLIC_EXPORT gint
 lok_doc_view_get_parts (LOKDocView* pDocView)
 {
     LOKDocViewPrivate& priv = getPrivate(pDocView);
@@ -2524,7 +2524,7 @@ lok_doc_view_get_parts (LOKDocView* pDocView)
     return priv->m_pDocument->pClass->getParts( priv->m_pDocument );
 }
 
-SAL_DLLPUBLIC_EXPORT int
+SAL_DLLPUBLIC_EXPORT gint
 lok_doc_view_get_part (LOKDocView* pDocView)
 {
     LOKDocViewPrivate& priv = getPrivate(pDocView);
@@ -2552,7 +2552,7 @@ lok_doc_view_set_part (LOKDocView* pDocView, int nPart)
     g_object_unref(task);
 }
 
-SAL_DLLPUBLIC_EXPORT char*
+SAL_DLLPUBLIC_EXPORT gchar*
 lok_doc_view_get_part_name (LOKDocView* pDocView, int nPart)
 {
     LOKDocViewPrivate& priv = getPrivate(pDocView);
@@ -2720,14 +2720,14 @@ lok_doc_view_paste (LOKDocView* pDocView,
     return ret;
 }
 
-SAL_DLLPUBLIC_EXPORT float
+SAL_DLLPUBLIC_EXPORT gfloat
 lok_doc_view_pixel_to_twip (LOKDocView* pDocView, float fInput)
 {
     LOKDocViewPrivate& priv = getPrivate(pDocView);
     return pixelToTwip(fInput, priv->m_fZoom);
 }
 
-SAL_DLLPUBLIC_EXPORT float
+SAL_DLLPUBLIC_EXPORT gfloat
 lok_doc_view_twip_to_pixel (LOKDocView* pDocView, float fInput)
 {
     LOKDocViewPrivate& priv = getPrivate(pDocView);