diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:46:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:46:48 +0000 |
| commit | f3a77a171cd34f0e34e6d0501192add67e6482a4 (patch) | |
| tree | 4e5a591f5f45ab661ef37c75278ad8dec1fe8660 /i18npool/source/isolang | |
| parent | INTEGRATION: CWS warnings01 (1.2.18); FILE MERGED (diff) | |
| download | core-f3a77a171cd34f0e34e6d0501192add67e6482a4.tar.gz core-f3a77a171cd34f0e34e6d0501192add67e6482a4.zip | |
INTEGRATION: CWS warnings01 (1.3.8); FILE MERGED
2006/05/26 13:43:11 sb 1.3.8.1: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170.
Diffstat (limited to 'i18npool/source/isolang')
| -rw-r--r-- | i18npool/source/isolang/isolang.cxx | 14 | ||||
| -rw-r--r-- | i18npool/source/isolang/mslangid.cxx | 6 |
2 files changed, 9 insertions, 11 deletions
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx index fb9fd4a9e9a0..45518ffdb66d 100644 --- a/i18npool/source/isolang/isolang.cxx +++ b/i18npool/source/isolang/isolang.cxx @@ -4,9 +4,9 @@ * * $RCSfile: isolang.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2006-05-04 09:12:14 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:46:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -694,14 +694,14 @@ LanguageType MsLangId::convertIsoNamesToLanguage( const rtl::OUString& rLang, // (to allow reading country and language in separate steps, in any order) if ( rCountry.getLength() && !rLang.getLength() ) { - const IsoLangEntry* pEntry = aImplIsoLangEntries; + const IsoLangEntry* pEntry2 = aImplIsoLangEntries; do { - if ( aUpperCountry.equalsAscii( pEntry->maCountry ) ) - return pEntry->mnLang; - ++pEntry; + if ( aUpperCountry.equalsAscii( pEntry2->maCountry ) ) + return pEntry2->mnLang; + ++pEntry2; } - while ( pEntry->mnLang != LANGUAGE_DONTKNOW ); + while ( pEntry2->mnLang != LANGUAGE_DONTKNOW ); aLowerLang = aUpperCountry.toAsciiLowerCase(); } diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx index 89023c0182e4..a7e69b8e6591 100644 --- a/i18npool/source/isolang/mslangid.cxx +++ b/i18npool/source/isolang/mslangid.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mslangid.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2006-05-04 09:12:42 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:46:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -185,7 +185,6 @@ bool MsLangId::isRightToLeft( LanguageType nLang ) case LANGUAGE_URDU & LANGUAGE_MASK_PRIMARY : case LANGUAGE_FARSI & LANGUAGE_MASK_PRIMARY : return true; - break; default: break; @@ -203,7 +202,6 @@ bool MsLangId::hasForbiddenCharacters( LanguageType nLang ) case LANGUAGE_JAPANESE & LANGUAGE_MASK_PRIMARY: case LANGUAGE_KOREAN & LANGUAGE_MASK_PRIMARY: return true; - break; default: break; } |