2012-04-19 16:49:26 +04:00
|
|
|
--- libreoffice-3.4.5/fpicker/source/unx/kde4/KDE4FilePicker.cxx 2012-04-19 15:41:14.571469364 +0300
|
|
|
|
+++ libreoffice-3.4.5/fpicker/source/unx/kde4/KDE4FilePicker.cxx 2012-04-19 15:42:56.414093242 +0300
|
|
|
|
@@ -56,7 +56,12 @@
|
|
|
|
#define Region QtXRegion
|
2012-04-17 15:11:02 +04:00
|
|
|
|
|
|
|
//kde has an enum that uses this...OO does too
|
2012-04-19 16:49:26 +04:00
|
|
|
+#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
|
2012-04-17 15:11:02 +04:00
|
|
|
#undef SETTINGS_MOUSE
|
2012-04-19 16:49:26 +04:00
|
|
|
+#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
|
2012-04-17 15:11:02 +04:00
|
|
|
+#undef SETTINGS_LOCALE
|
2012-04-19 16:49:26 +04:00
|
|
|
+#define LO_SETTINGS_STYLE SETTINGS_STYLE
|
|
|
|
+#undef SETTINGS_STYLE
|
2012-04-17 15:11:02 +04:00
|
|
|
|
|
|
|
#include <kfiledialog.h>
|
|
|
|
#include <kwindowsystem.h>
|
2012-04-19 16:49:26 +04:00
|
|
|
@@ -70,6 +75,13 @@
|
|
|
|
|
|
|
|
#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;
|
|
|
|
|
2012-04-19 13:57:25 +00:00
|
|
|
using namespace ::com::sun::star::ui::dialogs;
|