diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:40:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:40:03 +0000 |
| commit | 8de9775b5931f43db10cfccb96edce4bca11e9c3 (patch) | |
| tree | 19ca8c07718715d88e2f98c1a72ef419a3064a27 | |
| parent | 4fb01b7b425e8525e55994e80232e61eeb279dfc (diff) | |
INTEGRATION: CWS warnings01 (1.12.16); FILE MERGED
2006/03/08 13:19:07 nn 1.12.16.1: #i53898# warning-free code
| -rw-r--r-- | i18npool/inc/breakiterator_unicode.hxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index 0946b3a6d988..7af55aee0a74 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -4,9 +4,9 @@ * * $RCSfile: breakiterator_unicode.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hr $ $Date: 2005-11-17 20:30:00 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:40:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,17 @@ #define _I18N_BREAKITERATOR_UNICODE_HXX_ #include <breakiteratorImpl.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/brkiter.h> +#ifdef _MSC_VER +#pragma warning(pop) +#endif namespace com { namespace sun { namespace star { namespace i18n { |