|
 |
f325b2 |
From 01d4962ea8624a5f2a020a26020f725cd652b923 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
f325b2 |
Date: Fri, 20 Nov 2015 08:55:58 +0100
|
|
|
f325b2 |
Subject: [PATCH 350/398] -Werror,-Wdeprecated-declarations
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I7c7d3dda02a3745128a5a125b4b6952e087cdcda
|
|
|
f325b2 |
(cherry picked from commit 9a29e2f539fe3ca21229d6073455a736c64cc4e8)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 4 ++++
|
|
|
f325b2 |
1 file changed, 4 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
index aeccab11b3b2..e44a92a3f3de 100644
|
|
|
f325b2 |
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
|
|
|
f325b2 |
@@ -19,6 +19,8 @@
|
|
|
f325b2 |
#include <boost/optional.hpp>
|
|
|
f325b2 |
#include <gdk/gdkkeysyms.h>
|
|
|
f325b2 |
|
|
|
f325b2 |
+#include <sal/types.h>
|
|
|
f325b2 |
+
|
|
|
f325b2 |
#define LOK_USE_UNSTABLE_API
|
|
|
f325b2 |
#include <LibreOfficeKit/LibreOfficeKitGtk.h>
|
|
|
f325b2 |
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
|
|
|
f325b2 |
@@ -497,7 +499,9 @@ static void createModelAndView(const char* pLOPath, const char* pDocPath, const
|
|
|
f325b2 |
{
|
|
|
f325b2 |
GdkRGBA color;
|
|
|
f325b2 |
gdk_rgba_parse(&color, rArguments[i + 1].c_str());
|
|
|
f325b2 |
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
|
|
|
f325b2 |
gtk_widget_override_background_color(gtk_widget_get_toplevel(pDocView), GTK_STATE_FLAG_NORMAL, &color;;
|
|
|
f325b2 |
+ SAL_WNODEPRECATED_DECLARATIONS_POP
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
std::stringstream aStream;
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|