From 1408d6cfcf2e99235c8df7d083e9208d6c9a115a Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Tue, 20 Jun 2006 03:40:37 +0000 Subject: [PATCH] INTEGRATION: CWS warnings01 (1.8.14); FILE MERGED 2006/04/07 21:03:11 sb 1.8.14.3: RESYNC: (1.8-1.9); FILE MERGED 2006/03/08 13:19:07 nn 1.8.14.2: #i53898# warning-free code 2005/11/09 20:21:52 pl 1.8.14.1: #i53898# removed warnings --- i18npool/inc/collator_unicode.hxx | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx index b61bf2a24402..cf3638160101 100644 --- a/i18npool/inc/collator_unicode.hxx +++ b/i18npool/inc/collator_unicode.hxx @@ -4,9 +4,9 @@ * * $RCSfile: collator_unicode.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2006-01-31 18:33:46 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:40:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,7 +39,17 @@ #include #include #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 // ---------------------------------------------------- // class Collator_Unicode @@ -66,13 +76,13 @@ public: // following 4 methods are implemented in collatorImpl. - sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale, sal_Int32 collatorOptions) + sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&, sal_Int32) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} - void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const rtl::OUString& impl, const lang::Locale& rLocale, - const com::sun::star::uno::Sequence< sal_Int32 >& collatorOptions) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} - com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale ) + void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const rtl::OUString&, const lang::Locale&, + const com::sun::star::uno::Sequence< sal_Int32 >&) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} + com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} - com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const rtl::OUString& collatorAlgorithmName ) + com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const rtl::OUString& ) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} //XServiceInfo