|
 |
f325b2 |
From 0fb343d2b27c75fa77b5a740c7e7cf53c2ecbe1e Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Mon, 8 Jun 2015 08:02:37 +0200
|
|
|
f325b2 |
Subject: [PATCH 026/398] libreofficekit: fix RHEL5 build of tilebuffer
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I27da86c774f0450c844e742563c4a8de3f23ad34
|
|
|
f325b2 |
(cherry picked from commit a0ce0dd519ec298bf7df0111dca1e1c6fdc3a1ee)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 2 ++
|
|
|
f325b2 |
libreofficekit/source/gtk/tilebuffer.cxx | 4 ++++
|
|
|
f325b2 |
2 files changed, 6 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 9b09ef6452bb..a5cf7aaac741 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -1335,6 +1335,7 @@ SAL_DLLPUBLIC_EXPORT void lok_doc_view_post_key(GtkWidget* /*pWidget*/, GdkEvent
|
|
|
f325b2 |
|
|
|
f325b2 |
SAL_DLLPUBLIC_EXPORT void lok_doc_view_get_visarea(LOKDocView* pThis, GdkRectangle* pArea)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+#if GTK_CHECK_VERSION(2,14,0) // we need gtk_adjustment_get_page_size()
|
|
|
f325b2 |
float zoom = pThis->m_pImpl->m_fZoom;
|
|
|
f325b2 |
GtkAdjustment* pHAdjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(pThis));
|
|
|
f325b2 |
pArea->x = pixelToTwip(gtk_adjustment_get_value(pHAdjustment),zoom);
|
|
|
f325b2 |
@@ -1342,6 +1343,7 @@ SAL_DLLPUBLIC_EXPORT void lok_doc_view_get_visarea(LOKDocView* pThis, GdkRectang
|
|
|
f325b2 |
GtkAdjustment* pVAdjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(pThis));
|
|
|
f325b2 |
pArea->y = pixelToTwip(gtk_adjustment_get_value(pVAdjustment), zoom);
|
|
|
f325b2 |
pArea->height = pixelToTwip(gtk_adjustment_get_page_size(pVAdjustment), zoom);
|
|
|
f325b2 |
+#endif
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/tilebuffer.cxx b/libreofficekit/source/gtk/tilebuffer.cxx
|
|
|
f325b2 |
index 338038078ab3..0c798232326b 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/tilebuffer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/tilebuffer.cxx
|
|
|
f325b2 |
@@ -9,6 +9,10 @@
|
|
|
f325b2 |
|
|
|
f325b2 |
#include "tilebuffer.hxx"
|
|
|
f325b2 |
|
|
|
f325b2 |
+#if !GLIB_CHECK_VERSION(2,40,0)
|
|
|
f325b2 |
+#define g_info(...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__)
|
|
|
f325b2 |
+#endif
|
|
|
f325b2 |
+
|
|
|
f325b2 |
/* ------------------
|
|
|
f325b2 |
Utility functions
|
|
|
f325b2 |
------------------
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|