summaryrefslogtreecommitdiff
path: root/fpicker/source/unx/kde4/KDE4FilePicker.cxx
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-03-08 13:15:09 (GMT)
committerDavid Tardon <dtardon@redhat.com>2012-03-08 13:17:30 (GMT)
commitee67c55260ec7723c39606955ccdbd3e2934935a (patch)
tree8abcb09658573fc6b90ea950d141bb5fa43c42db /fpicker/source/unx/kde4/KDE4FilePicker.cxx
parentd5cb0636dc902f069307a44181ce5bb14932c0f9 (diff)
yet another clash with macro name
Diffstat (limited to 'fpicker/source/unx/kde4/KDE4FilePicker.cxx')
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 269deee..8e8b3e8 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -60,6 +60,8 @@
#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>
@@ -77,6 +79,8 @@
#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;