|
 |
135360 |
From fb4b7c191098c0fca7255860e5835798b9fed4c3 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
Date: Fri, 12 Jun 2015 15:45:16 +0200
|
|
|
135360 |
Subject: [PATCH 042/398] Fix RHEL5 build
|
|
|
135360 |
|
|
|
135360 |
Change-Id: I9a71ee85d2d28aed5bd3f4d1f6e91261a9228d04
|
|
|
135360 |
(cherry picked from commit e6c37fdee5ddd35460aacca401bf581d021384d9)
|
|
|
135360 |
---
|
|
|
135360 |
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 2 ++
|
|
|
135360 |
1 file changed, 2 insertions(+)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
135360 |
index 4f74583f52b3..2ce541d1ba84 100644
|
|
|
135360 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
135360 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
135360 |
@@ -135,6 +135,7 @@ static void toggleFindbar(GtkWidget* /*pButton*/, gpointer /*pItem*/)
|
|
|
135360 |
/// Get the visible area of the scrolled window
|
|
|
135360 |
static void getVisibleAreaTwips(GdkRectangle* pArea)
|
|
|
135360 |
{
|
|
|
135360 |
+#if GTK_CHECK_VERSION(2,14,0) // we need gtk_adjustment_get_page_size()
|
|
|
135360 |
GtkAdjustment* pHAdjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(pScrolledWindow));
|
|
|
135360 |
GtkAdjustment* pVAdjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(pScrolledWindow));
|
|
|
135360 |
|
|
|
135360 |
@@ -146,6 +147,7 @@ static void getVisibleAreaTwips(GdkRectangle* pArea)
|
|
|
135360 |
gtk_adjustment_get_page_size(pHAdjustment));
|
|
|
135360 |
pArea->height = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView),
|
|
|
135360 |
gtk_adjustment_get_page_size(pVAdjustment));
|
|
|
135360 |
+#endif
|
|
|
135360 |
}
|
|
|
135360 |
|
|
|
135360 |
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|