From 63d13f042cddb4255a02fe5e88c1557b921dc50f Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 12 Dec 2006 15:11:19 +0000 Subject: [PATCH] INTEGRATION: CWS icuupgrade (1.13.8); FILE MERGED 2006/09/06 01:01:36 khong 1.13.8.2: #i60645# upgrade to icu 3.6 2006/08/04 12:25:56 er 1.13.8.1: #i60645# warnings guards for some ICU header files --- i18npool/inc/breakiterator_unicode.hxx | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index 7af55aee0a74..f25c6844ebd2 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -4,9 +4,9 @@ * * $RCSfile: breakiterator_unicode.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hr $ $Date: 2006-06-20 04:40:03 $ + * last change: $Author: kz $ $Date: 2006-12-12 16:11:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,16 +37,7 @@ #include -// 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 -#ifdef _MSC_VER -#pragma warning(pop) -#endif +#include "warnings_guard_unicode_brkiter.h" namespace com { namespace sun { namespace star { namespace i18n { @@ -101,7 +92,7 @@ protected: Boundary result; // for word break iterator struct { - rtl::OUString aText; + UnicodeString aICUText; icu::BreakIterator *aBreakIterator; } character, word, sentence, line, *icuBI; com::sun::star::lang::Locale aLocale;