INTEGRATION: CWS icuupgrade (1.10.8); FILE MERGED

2006/09/06 01:01:37 khong 1.10.8.2: #i60645# upgrade to icu 3.6
2006/08/04 12:25:56 er 1.10.8.1: #i60645# warnings guards for some ICU header files

1 files changed, 4 insertions, 12 deletions

diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index cf3638160101..ea00120cb22e 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: collator_unicode.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: hr $ $Date: 2006-06-20 04:40:37 $
+ *  last change: $Author: kz $ $Date: 2006-12-12 16:12:21 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,16 +40,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <osl/module.h>
 
-// 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"
 
 //      ----------------------------------------------------
 //      class Collator_Unicode
@@ -94,6 +85,7 @@ protected:
     const sal_Char *implementationName;
 private:
     RuleBasedCollator *collator;
+    oslModule hModule;
 };
 
 } } } }