Author: damjan
Date: Wed Dec 21 01:05:48 2016
New Revision: 1775367
URL: http://svn.apache.org/viewvc?rev=1775367&view=rev
Log:
Fix build errors in the KDE file picker caused by defines
duplicated between KDE4 and AOO.
Patch by: me
Modified:
openoffice/trunk/main/fpicker/source/unx/kde4/KDE4FilePicker.cxx
Modified: openoffice/trunk/main/fpicker/source/unx/kde4/KDE4FilePicker.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/unx/kde4/KDE4FilePicker.cxx?rev=1775367&r1=1775366&r2=1775367&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/unx/kde4/KDE4FilePicker.cxx (original)
+++ openoffice/trunk/main/fpicker/source/unx/kde4/KDE4FilePicker.cxx Wed Dec 21
01:05:48 2016
@@ -52,6 +52,8 @@
//kde has an enum that uses this...OO does too
#undef SETTINGS_MOUSE
+#undef SETTINGS_LOCALE
+#undef SETTINGS_STYLE
#include <kfiledialog.h>
#include <kwindowsystem.h>
