You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.1 KiB
41 lines
1.1 KiB
13 years ago
|
From 0d7e2108425da1f81c20a605145679168486df59 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@suse.cz>
|
||
|
|
Date: Fri, 6 Jan 2012 10:55:03 +0100
|
||
|
|
Subject: [PATCH] workaround for LO namespace pollution breaking KDE4 fpicker
|
||
|
|
build
|
||
|
|
|
||
|
|
---
|
||
|
|
fpicker/source/unx/kde4/KDE4FilePicker.cxx | 8 ++++++++
|
||
|
|
1 files changed, 8 insertions(+), 0 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||
|
|
index f282645..69be3b1 100644
|
||
|
|
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||
|
|
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||
|
|
@@ -56,7 +56,10 @@
|
||
|
|
#define Region QtXRegion
|
||
|
|
|
||
|
|
//kde has an enum that uses this...OO does too
|
||
|
|
+#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
|
||
|
|
#undef SETTINGS_MOUSE
|
||
|
|
+#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
|
||
|
|
+#undef SETTINGS_LOCALE
|
||
|
|
|
||
|
|
#include <kfiledialog.h>
|
||
|
|
#include <kwindowsystem.h>
|
||
|
|
@@ -70,6 +73,11 @@
|
||
|
|
|
||
|
|
#undef Region
|
||
|
|
|
||
|
|
+#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
|
||
|
|
+#undef LO_SETTINGS_MOUSE
|
||
|
|
+#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
|
||
|
|
+#undef LO_SETTINGS_LOCALE
|
||
|
|
+
|
||
|
|
using namespace ::com::sun::star;
|
||
|
|
|
||
|
|
using namespace ::com::sun::star::ui::dialogs;
|
||
|
|
--
|
||
|
|
1.7.7.5
|
||
|
|
|