[Libreoffice-commits] .: framework/source

[Bjoern Michaelsen]

 framework/source/lomenubar/DesktopJob.cxx  |    4 ++++
 framework/source/lomenubar/FrameHelper.cxx |    3 ++-
 framework/source/lomenubar/FrameHelper.hxx |    3 ++-
 framework/source/lomenubar/FrameJob.cxx    |    4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 2e850f9fdfba19122efaeac8814a8147ed680ed2
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Apr 1 14:06:10 2011 +0200

    pragmatic approach to silence warnings

diff --git a/framework/source/lomenubar/DesktopJob.cxx b/framework/source/lomenubar/DesktopJob.cxx
index 2913215..c813bb4 100644
--- a/framework/source/lomenubar/DesktopJob.cxx
+++ b/framework/source/lomenubar/DesktopJob.cxx
@@ -25,7 +25,11 @@
 #include "FrameJob.hxx"
 
 #include <gio/gio.h>
+//#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #include <libdbusmenu-glib/server.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
+//#pragma GCC diagnostic pop
 
 #include <rtl/process.h>
 #include <osl/diagnose.h>
diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx
index f9998de..7008cb3 100644
--- a/framework/source/lomenubar/FrameHelper.cxx
+++ b/framework/source/lomenubar/FrameHelper.cxx
@@ -63,8 +63,9 @@
 
 #include <gio/gio.h>
 //#pragma GCC diagnostic push
-//#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #include <libdbusmenu-glib/client.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
 //#pragma GCC diagnostic pop
 #include <libdbusmenu-gtk/menuitem.h>
 
diff --git a/framework/source/lomenubar/FrameHelper.hxx b/framework/source/lomenubar/FrameHelper.hxx
index d34220f..9c37a08 100644
--- a/framework/source/lomenubar/FrameHelper.hxx
+++ b/framework/source/lomenubar/FrameHelper.hxx
@@ -44,8 +44,9 @@
 #include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
 
 //#pragma GCC diagnostic push
-//#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #include <libdbusmenu-glib/server.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
 //#pragma GCC diagnostic pop
 #include <libdbusmenu-glib/menuitem.h>
 
diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx
index bbf53ce..3014573 100644
--- a/framework/source/lomenubar/FrameJob.cxx
+++ b/framework/source/lomenubar/FrameJob.cxx
@@ -62,8 +62,12 @@
 #include <fstream>
 
 #include <gio/gio.h>
+//#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-glib/client.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
+//#pragma GCC diagnostic pop
 
 #include <rtl/process.h>
 #include <osl/diagnose.h>