mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop redundant conditions

Browse Source 
nMappingType is checked in lcl_getMappingTypeForToggleCase

Change-Id: I5e13ffad9028ca40d23e5ca19d765b3ee43c5724
Reviewed-on: https://gerrit.libreoffice.org/81151
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov <qarkai@gmail.com>
This commit is contained in:
Arkadiy Illarionov
2019-10-20 11:57:11 +03:00
parent b67af57b98
commit a2b46aa93f
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
i18npool/source/transliteration/transliteration_body.cxx
View File

@@ -100,9 +100,7 @@ Transliteration_body::transliterateImpl(
for (i = 0; i < nCount; i++) for (i = 0; i < nCount; i++)
{ {
// take care of TOGGLE_CASE transliteration: // take care of TOGGLE_CASE transliteration:
MappingType nTmpMappingType = nMappingType; MappingType nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] );
if (nMappingType == (MappingType::LowerToUpper | MappingType::UpperToLower))
nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] );
const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType ); const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType );
nOffCount += map.nmap; nOffCount += map.nmap;
@@ -118,9 +116,7 @@ Transliteration_body::transliterateImpl(
for (i = 0; i < nCount; i++) for (i = 0; i < nCount; i++)
{ {
// take care of TOGGLE_CASE transliteration: // take care of TOGGLE_CASE transliteration:
MappingType nTmpMappingType = nMappingType; MappingType nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] );
if (nMappingType == (MappingType::LowerToUpper | MappingType::UpperToLower))
nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] );
const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType ); const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType );
for (sal_Int32 k = 0; k < map.nmap; k++) for (sal_Int32 k = 0; k < map.nmap; k++)
@@ -158,9 +154,7 @@ Transliteration_body::transliterateImpl(
for ( sal_Int32 i = 0; i < nCount; i++) for ( sal_Int32 i = 0; i < nCount; i++)
{ {
// take care of TOGGLE_CASE transliteration: // take care of TOGGLE_CASE transliteration:
MappingType nTmpMappingType = nMappingType; MappingType nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] );
if (nMappingType == (MappingType::LowerToUpper | MappingType::UpperToLower))
nTmpMappingType = lcl_getMappingTypeForToggleCase( nMappingType, in[i] );
const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType ); const i18nutil::Mapping &map = i18nutil::casefolding::getValue( in, i, nCount, aLocale, nTmpMappingType );
for (sal_Int32 k = 0; k < map.nmap; k++) for (sal_Int32 k = 0; k < map.nmap; k++)