diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-08 14:15:09 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-08 14:17:30 +0100 |
| commit | ee67c55260ec7723c39606955ccdbd3e2934935a (patch) | |
| tree | 8abcb09658573fc6b90ea950d141bb5fa43c42db /fpicker/source/unx/kde4/KDE4FilePicker.cxx | |
| parent | d5cb0636dc902f069307a44181ce5bb14932c0f9 (diff) | |
yet another clash with macro name
Diffstat (limited to 'fpicker/source/unx/kde4/KDE4FilePicker.cxx')
| -rw-r--r-- | fpicker/source/unx/kde4/KDE4FilePicker.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 269deee67d92..8e8b3e8fa7d9 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -57,12 +57,14 @@ //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 +#define LO_SETTINGS_STYLE SETTINGS_STYLE +#undef SETTINGS_STYLE #include <kfiledialog.h> #include <kwindowsystem.h> #include <kapplication.h> #include <kfilefiltercombo.h> @@ -74,12 +76,14 @@ #undef Region #define SETTINGS_MOUSE LO_SETTINGS_MOUSE #undef LO_SETTINGS_MOUSE #define SETTINGS_LOCALE LO_SETTINGS_LOCALE #undef LO_SETTINGS_LOCALE +#define SETTINGS_STYLE LO_SETTINGS_STYLE +#undef LO_SETTINGS_STYLE using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; |