|
 |
135360 |
From 6e8ac71304481d1e844dab199d2e5477ca9eeb7f Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
Date: Fri, 11 Sep 2015 14:47:17 +0200
|
|
|
135360 |
Subject: [PATCH 108/398] LOK: don't use unstable API unconditionally when
|
|
|
135360 |
including the GTK header
|
|
|
135360 |
|
|
|
135360 |
Change-Id: I679ddfdadbf4746d3fba64d3d5157ec070b4f6dd
|
|
|
135360 |
(cherry picked from commit 88c51cd55d1a9b29e62269c53b3923770253ab07)
|
|
|
135360 |
---
|
|
|
135360 |
include/LibreOfficeKit/LibreOfficeKitGtk.h | 1 -
|
|
|
135360 |
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 1 +
|
|
|
135360 |
2 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h b/include/LibreOfficeKit/LibreOfficeKitGtk.h
|
|
|
135360 |
index 02789ad3f585..01009fb9eb40 100644
|
|
|
135360 |
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
|
|
|
135360 |
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
|
|
|
135360 |
@@ -13,7 +13,6 @@
|
|
|
135360 |
#include <gtk/gtk.h>
|
|
|
135360 |
#include <gdk/gdk.h>
|
|
|
135360 |
|
|
|
135360 |
-#define LOK_USE_UNSTABLE_API
|
|
|
135360 |
#include <LibreOfficeKit/LibreOfficeKit.h>
|
|
|
135360 |
|
|
|
135360 |
G_BEGIN_DECLS
|
|
|
135360 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
135360 |
index 57d0c113d6ac..ab33fc703731 100644
|
|
|
135360 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
135360 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
135360 |
@@ -16,6 +16,7 @@
|
|
|
135360 |
#include <boost/property_tree/json_parser.hpp>
|
|
|
135360 |
#include <gdk/gdkkeysyms.h>
|
|
|
135360 |
|
|
|
135360 |
+#define LOK_USE_UNSTABLE_API
|
|
|
135360 |
#include <LibreOfficeKit/LibreOfficeKitGtk.h>
|
|
|
135360 |
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
|
|
|
135360 |
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|