|
 |
f325b2 |
From 466c0c035a0d03c76c82ad360b350f887c221912 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Pranav Kant <pranavk@libreoffice.org>
|
|
|
f325b2 |
Date: Thu, 17 Dec 2015 20:35:23 +0530
|
|
|
f325b2 |
Subject: [PATCH 375/398] lokdocview: Use GLib basic types
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I07add7b9dcb1dc53d7ed61ff71545489de3be155
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/20778
|
|
|
f325b2 |
Reviewed-by: David Tardon <dtardon@redhat.com>
|
|
|
f325b2 |
Tested-by: David Tardon <dtardon@redhat.com>
|
|
|
f325b2 |
(cherry picked from commit b902432b431d01634c1f56e4758ec236a999650d)
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/21265
|
|
|
f325b2 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
f325b2 |
Reviewed-by: Pranav Kant <pranavk@gnome.org>
|
|
|
f325b2 |
(cherry picked from commit 0886f49224064a259ed6615961f420ab7b6fc3ef)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
include/LibreOfficeKit/LibreOfficeKitGtk.h | 12 ++++++------
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 12 ++++++------
|
|
|
f325b2 |
2 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
|
|
|
f325b2 |
index 903a74256ffa..c3cba8fe3417 100644
|
|
|
f325b2 |
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
|
|
|
f325b2 |
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
|
|
|
f325b2 |
@@ -118,19 +118,19 @@ void lok_doc_view_set_zoom (LOKDocView*
|
|
|
f325b2 |
*
|
|
|
f325b2 |
* Returns: The current zoom factor value in float for pDocView
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
-float lok_doc_view_get_zoom (LOKDocView* pDocView);
|
|
|
f325b2 |
+gfloat lok_doc_view_get_zoom (LOKDocView* pDocView);
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
* lok_doc_view_get_parts:
|
|
|
f325b2 |
* @pDocView: The #LOKDocView instance
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
-int lok_doc_view_get_parts (LOKDocView* pDocView);
|
|
|
f325b2 |
+gint lok_doc_view_get_parts (LOKDocView* pDocView);
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
* lok_doc_view_get_part:
|
|
|
f325b2 |
* @pDocView: The #LOKDocView instance
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
-int lok_doc_view_get_part (LOKDocView* pDocView);
|
|
|
f325b2 |
+gint lok_doc_view_get_part (LOKDocView* pDocView);
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
* lok_doc_view_set_part:
|
|
|
f325b2 |
@@ -145,7 +145,7 @@ void lok_doc_view_set_part (LOKDocView*
|
|
|
f325b2 |
* @pDocView: The #LOKDocView instance
|
|
|
f325b2 |
* @nPart:
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
-char* lok_doc_view_get_part_name (LOKDocView* pDocView,
|
|
|
f325b2 |
+gchar* lok_doc_view_get_part_name (LOKDocView* pDocView,
|
|
|
f325b2 |
int nPart);
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
@@ -272,7 +272,7 @@ gboolean lok_doc_view_paste (LOKDocView*
|
|
|
f325b2 |
*
|
|
|
f325b2 |
* Returns: The corresponding value in twips
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
-float lok_doc_view_pixel_to_twip (LOKDocView* pDocView,
|
|
|
f325b2 |
+gfloat lok_doc_view_pixel_to_twip (LOKDocView* pDocView,
|
|
|
f325b2 |
float fInput);
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
@@ -284,7 +284,7 @@ float lok_doc_view_pixel_to_twip (LOKDocView*
|
|
|
f325b2 |
*
|
|
|
f325b2 |
* Returns: The corresponding value in pixels
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
-float lok_doc_view_twip_to_pixel (LOKDocView* pDocView,
|
|
|
f325b2 |
+gfloat lok_doc_view_twip_to_pixel (LOKDocView* pDocView,
|
|
|
f325b2 |
float fInput);
|
|
|
f325b2 |
|
|
|
f325b2 |
G_END_DECLS
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index ccc45657626b..9d7f0740595e 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -2507,14 +2507,14 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
|
|
|
f325b2 |
g_object_unref(task);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-SAL_DLLPUBLIC_EXPORT float
|
|
|
f325b2 |
+SAL_DLLPUBLIC_EXPORT gfloat
|
|
|
f325b2 |
lok_doc_view_get_zoom (LOKDocView* pDocView)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
LOKDocViewPrivate& priv = getPrivate(pDocView);
|
|
|
f325b2 |
return priv->m_fZoom;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-SAL_DLLPUBLIC_EXPORT int
|
|
|
f325b2 |
+SAL_DLLPUBLIC_EXPORT gint
|
|
|
f325b2 |
lok_doc_view_get_parts (LOKDocView* pDocView)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
LOKDocViewPrivate& priv = getPrivate(pDocView);
|
|
|
f325b2 |
@@ -2522,7 +2522,7 @@ lok_doc_view_get_parts (LOKDocView* pDocView)
|
|
|
f325b2 |
return priv->m_pDocument->pClass->getParts( priv->m_pDocument );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-SAL_DLLPUBLIC_EXPORT int
|
|
|
f325b2 |
+SAL_DLLPUBLIC_EXPORT gint
|
|
|
f325b2 |
lok_doc_view_get_part (LOKDocView* pDocView)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
LOKDocViewPrivate& priv = getPrivate(pDocView);
|
|
|
f325b2 |
@@ -2550,7 +2550,7 @@ lok_doc_view_set_part (LOKDocView* pDocView, int nPart)
|
|
|
f325b2 |
g_object_unref(task);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-SAL_DLLPUBLIC_EXPORT char*
|
|
|
f325b2 |
+SAL_DLLPUBLIC_EXPORT gchar*
|
|
|
f325b2 |
lok_doc_view_get_part_name (LOKDocView* pDocView, int nPart)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
LOKDocViewPrivate& priv = getPrivate(pDocView);
|
|
|
f325b2 |
@@ -2718,14 +2718,14 @@ lok_doc_view_paste (LOKDocView* pDocView,
|
|
|
f325b2 |
return ret;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-SAL_DLLPUBLIC_EXPORT float
|
|
|
f325b2 |
+SAL_DLLPUBLIC_EXPORT gfloat
|
|
|
f325b2 |
lok_doc_view_pixel_to_twip (LOKDocView* pDocView, float fInput)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
LOKDocViewPrivate& priv = getPrivate(pDocView);
|
|
|
f325b2 |
return pixelToTwip(fInput, priv->m_fZoom);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-SAL_DLLPUBLIC_EXPORT float
|
|
|
f325b2 |
+SAL_DLLPUBLIC_EXPORT gfloat
|
|
|
f325b2 |
lok_doc_view_twip_to_pixel (LOKDocView* pDocView, float fInput)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
LOKDocViewPrivate& priv = getPrivate(pDocView);
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|