Djam/libreoffice
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libreoffice.git synced 2025-02-23 18:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated libreoffice-3.4.5-fpicker-kde-4.8.0-compile.patch

Browse source
This commit is contained in:
Andrew Lukoshko 2012-04-19 16:49:26 +04:00
parent d90778ba1e
commit fc55654b8d
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libreoffice-3.4.5-fpicker-kde-4.8.0-compile.patch
View file

@ -1,10 +1,29 @@
--- libreoffice-3.4.5/fpicker/source/unx/kde4/KDE4FilePicker.cxx.ark 2012-01-31 19:11:16.582876303 +0100
+++ libreoffice-3.4.5/fpicker/source/unx/kde4/KDE4FilePicker.cxx 2012-01-31 19:11:37.026875942 +0100
@@ -57,6 +57,7 @@
--- 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
//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>
@@ -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;
using namespace ::com::sun::star::ui::dialogs;