summaryrefslogtreecommitdiff
authorLuboš Luňák <l.lunak@suse.cz>2012-01-06 09:55:03 (GMT)
committer Luboš Luňák <l.lunak@suse.cz>2012-01-06 09:57:57 (GMT)
commit0d7e2108425da1f81c20a605145679168486df59 (patch) (side-by-side diff)
tree29bc344a3886c7f6dcf35aa8a0cb4229e95f9218
parent79f5f4c97188e8584aceb6af98473c06f40f7500 (diff)
downloadcore-0d7e2108425da1f81c20a605145679168486df59.zip
core-0d7e2108425da1f81c20a605145679168486df59.tar.gz
workaround for LO namespace pollution breaking KDE4 fpicker build
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx8
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;