[Libreoffice-commits] .: Branch 'libreoffice-3-4' - fpicker/source

[Petr Mladek]

 fpicker/source/unx/kde4/KDE4FilePicker.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 03ddc4da92ad715da54b8977013c4927f6bcd9a6
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Jan 6 10:55:03 2012 +0100

    workaround for LO namespace pollution breaking KDE4 fpicker build
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index e2f43fd..4717c0c 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;