diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:15:22 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:15:22 +0000 |
| commit | 09f8f27eba7a3af25cb79d2e34234afb119aff72 (patch) | |
| tree | 1b7aa60d6a71f8c63fa9fe0aeff2f3b0572e4d5a /i18npool/source/collator | |
| parent | 0b916315164ede8283b2dd55824d4e6424faed69 (diff) | |
INTEGRATION: CWS icuupgrade (1.7.6); FILE MERGED
2006/10/11 06:14:11 khong 1.7.6.4: RESYNC: (1.8-1.9); FILE MERGED
2006/08/04 12:25:57 er 1.7.6.3: #i60645# warnings guards for some ICU header files
2006/07/07 10:59:56 hdu 1.7.6.2: RESYNC: (1.7-1.8); FILE MERGED
2006/06/15 16:09:12 khong 1.7.6.1: #i60645# upgrade icu to 3.4.1
Diffstat (limited to 'i18npool/source/collator')
| -rw-r--r-- | i18npool/source/collator/gencoll_rule.cxx | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx index 0174ff698e29..11139c678ab1 100644 --- a/i18npool/source/collator/gencoll_rule.cxx +++ b/i18npool/source/collator/gencoll_rule.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gencoll_rule.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-17 09:17:31 $ + * last change: $Author: kz $ $Date: 2006-12-12 16:15:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -43,16 +43,7 @@ #include <sal/types.h> #include <rtl/ustrbuf.hxx> -// External unicode includes (from icu) cause warning C4668 on Windows. -// We want to minimize the patches to external headers, so the warnings are -// disabled here instead of in the header file itself. -#ifdef _MSC_VER -#pragma warning(push, 1) -#endif -#include <unicode/tblcoll.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif +#include "warnings_guard_unicode_tblcoll.h" using namespace ::rtl; @@ -94,9 +85,6 @@ void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len) } -U_CAPI uint8_t* U_EXPORT2 -ucol_cloneRuleData(const UCollator *coll, int32_t *length, UErrorCode *status); - SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { FILE *fp; @@ -138,7 +126,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if (U_SUCCESS(status)) { int32_t len = 0; - //uint8_t *data = ucol_cloneRuleData(coll, &len, &status); uint8_t *data = coll->cloneRuleData(len, status); if (U_SUCCESS(status) && data != NULL) |