strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS icuupgrade (1.10.8); FILE MERGED

Browse source 
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
This commit is contained in:
Kurt Zenker 2006-12-12 15:12:21 +00:00
parent 59cea090cc
commit b07edb9cbc
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
i18npool/inc/collator_unicode.hxx
View file

@ -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;
};
} } } }