diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:54 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:54 +0200 |
| commit | ec6c98105a95bd5ddcd74b30fe51df8434c27fbd (patch) | |
| tree | fcb9f35a6d4a4d4450358a1515bf792788e3c3d1 /i18nutil | |
| parent | da94363ed7a895fe39cee8d9b762966ebbee50ef (diff) | |
| parent | dd8d3fff260af37f152b3b6f0b8bcba2467a17fd (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
svtools/source/filter/wmf/winmtf.hxx
tools/source/fsys/urlobj.cxx
unotools/source/config/configmgr.cxx
unotools/source/config/makefile.mk
vcl/inc/vcl/cursor.hxx
vcl/source/gdi/outdevnative.cxx
vcl/source/window/abstdlg.cxx
vcl/source/window/toolbox.cxx
vcl/unx/generic/printer/ppdparser.cxx
vcl/unx/generic/printer/printerinfomanager.cxx
Diffstat (limited to 'i18nutil')
| -rw-r--r-- | i18nutil/source/utility/unicode.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index 83dd81b406cf..f04faa5846cf 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -31,6 +31,11 @@ #include <i18nutil/unicode.hxx> #include "unicode_data.h" +// Workaround for glibc braindamage: +// glibc 2.4's langinfo.h does "#define CURRENCY_SYMBOL __CURRENCY_SYMBOL" +// which (obviously) breaks UnicodeType::CURRENCY_SYMBOL +#undef CURRENCY_SYMBOL + using namespace ::com::sun::star::i18n; static ScriptTypeList defaultTypeList[] = { |