mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workaround for LO namespace pollution breaking KDE4 fpicker build

Browse Source
This commit is contained in:
Luboš Luňák
2012-01-06 10:55:03 +01:00
parent 79f5f4c971
commit 0d7e210842
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fpicker/source/unx/kde4/KDE4FilePicker.cxx
View File

@@ -56,7 +56,10 @@
#define Region QtXRegion #define Region QtXRegion
//kde has an enum that uses this...OO does too //kde has an enum that uses this...OO does too
#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
#undef SETTINGS_MOUSE #undef SETTINGS_MOUSE
#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
#undef SETTINGS_LOCALE
#include <kfiledialog.h> #include <kfiledialog.h>
#include <kwindowsystem.h> #include <kwindowsystem.h>
@@ -70,6 +73,11 @@
#undef Region #undef Region
#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
#undef LO_SETTINGS_MOUSE
#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
#undef LO_SETTINGS_LOCALE
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs;