diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-01-06 10:55:03 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-01-06 10:57:57 +0100 |
commit | 0d7e2108425da1f81c20a605145679168486df59 (patch) | |
tree | 29bc344a3886c7f6dcf35aa8a0cb4229e95f9218 | |
parent | 79f5f4c97188e8584aceb6af98473c06f40f7500 (diff) |
workaround for LO namespace pollution breaking KDE4 fpicker build
-rw-r--r-- | 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 f282645e2dbb..69be3b1bb2eb 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx | |||
@@ -56,7 +56,10 @@ | |||
56 | #define Region QtXRegion | 56 | #define Region QtXRegion |
57 | 57 | ||
58 | //kde has an enum that uses this...OO does too | 58 | //kde has an enum that uses this...OO does too |
59 | #define LO_SETTINGS_MOUSE SETTINGS_MOUSE | ||
59 | #undef SETTINGS_MOUSE | 60 | #undef SETTINGS_MOUSE |
61 | #define LO_SETTINGS_LOCALE SETTINGS_LOCALE | ||
62 | #undef SETTINGS_LOCALE | ||
60 | 63 | ||
61 | #include <kfiledialog.h> | 64 | #include <kfiledialog.h> |
62 | #include <kwindowsystem.h> | 65 | #include <kwindowsystem.h> |
@@ -70,6 +73,11 @@ | |||
70 | 73 | ||
71 | #undef Region | 74 | #undef Region |
72 | 75 | ||
76 | #define SETTINGS_MOUSE LO_SETTINGS_MOUSE | ||
77 | #undef LO_SETTINGS_MOUSE | ||
78 | #define SETTINGS_LOCALE LO_SETTINGS_LOCALE | ||
79 | #undef LO_SETTINGS_LOCALE | ||
80 | |||
73 | using namespace ::com::sun::star; | 81 | using namespace ::com::sun::star; |
74 | 82 | ||
75 | using namespace ::com::sun::star::ui::dialogs; | 83 | using namespace ::com::sun::star::ui::dialogs; |