From 466c0c035a0d03c76c82ad360b350f887c221912 Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Thu, 17 Dec 2015 20:35:23 +0530 Subject: [PATCH 375/398] lokdocview: Use GLib basic types Change-Id: I07add7b9dcb1dc53d7ed61ff71545489de3be155 Reviewed-on: https://gerrit.libreoffice.org/20778 Reviewed-by: David Tardon Tested-by: David Tardon (cherry picked from commit b902432b431d01634c1f56e4758ec236a999650d) Reviewed-on: https://gerrit.libreoffice.org/21265 Tested-by: Jenkins Reviewed-by: Pranav Kant (cherry picked from commit 0886f49224064a259ed6615961f420ab7b6fc3ef) --- include/LibreOfficeKit/LibreOfficeKitGtk.h | 12 ++++++------ libreofficekit/source/gtk/lokdocview.cxx | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h index 903a74256ffa..c3cba8fe3417 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 ccc45657626b..9d7f0740595e 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -2507,14 +2507,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); @@ -2522,7 +2522,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); @@ -2550,7 +2550,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); @@ -2718,14 +2718,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); -- 2.12.0