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 /fpicker | |
| parent | 79f5f4c97188e8584aceb6af98473c06f40f7500 (diff) | |
workaround for LO namespace pollution breaking KDE4 fpicker build
Diffstat (limited to 'fpicker')
| -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 @@ #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; |