diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:45:28 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:45:28 +0000 |
| commit | 9ea3f521974dbf269a044bcf0e6a75b8331e34c5 (patch) | |
| tree | 8d25abff5670fba1d4eb8339507c8f52bfc3113a /i18npool/source/indexentry | |
| parent | 87d19c77dddc27dd236d9df8c61f9e48b6dc0070 (diff) | |
INTEGRATION: CWS warnings01 (1.9.16); FILE MERGED
2006/05/24 00:29:20 sb 1.9.16.2: RESYNC: (1.9-1.10); FILE MERGED
2006/03/08 13:19:10 nn 1.9.16.1: #i53898# warning-free code
Diffstat (limited to 'i18npool/source/indexentry')
| -rw-r--r-- | i18npool/source/indexentry/indexentrysupplier_default.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index fd5d2da5a547..a262f6e6128c 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -4,9 +4,9 @@ * * $RCSfile: indexentrysupplier_default.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2006-04-20 11:58:59 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:45:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,7 +112,7 @@ void IndexTable::init(sal_Unicode start_, sal_Unicode end_, IndexKey *keys, sal_ sal_Int16 j; for (j = 0; j < key_count; j++) { if (keys[j].key > 0 && (i == keys[j].key || index->compare(i, keys[j].key) == 0)) { - table[i-start] = j; + table[i-start] = sal::static_int_cast<sal_uInt8>(j); break; } } @@ -133,7 +133,7 @@ Index::~Index() sal_Int16 Index::compare(sal_Unicode c1, sal_Unicode c2) { - return collator->compareString(OUString(&c1, 1), OUString(&c2, 1)); + return sal::static_int_cast<sal_Int16>( collator->compareString(OUString(&c1, 1), OUString(&c2, 1)) ); } sal_Int16 Index::getIndexWeight(const OUString& rIndexEntry) @@ -185,7 +185,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm throw RuntimeException(); } - sal_Int16 len = keyStr.getLength(); + sal_Int16 len = sal::static_int_cast<sal_Int16>( keyStr.getLength() ); mkey_count=key_count=0; skipping_chars=OUString(); sal_Int16 i, j; @@ -271,7 +271,7 @@ void Index::init(const lang::Locale &rLocale, const OUString& algorithm) throw ( throw RuntimeException(); } - table_count = scriptList.getLength(); + table_count = sal::static_int_cast<sal_Int16>( scriptList.getLength() ); if (table_count > MAX_TABLES) throw RuntimeException(); |