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

longparas: same variable used for two different loops of different types

Browse Source 
Change-Id: I1efdeb3f9bbda47d8f465a04fb36164e7ffc347b
This commit is contained in:
Caolán McNamara
2013-11-08 15:30:40 +00:00
parent aa92403a2b
commit cc7deac705
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
editeng/source/misc/svxacorr.cxx
View File

@@ -359,7 +359,6 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const OUString& rTx
// Is the word a compounded word separated by delimiters? // Is the word a compounded word separated by delimiters?
// If so, keep track of all delimiters so each constituent // If so, keep track of all delimiters so each constituent
// word can be checked for two initial capital letters. // word can be checked for two initial capital letters.
xub_StrLen n = 0;
std::deque<xub_StrLen> aDelimiters; std::deque<xub_StrLen> aDelimiters;
// Always check for two capitals at the beginning // Always check for two capitals at the beginning
@@ -367,13 +366,12 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const OUString& rTx
aDelimiters.push_back(nSttPos); aDelimiters.push_back(nSttPos);
// Find all compound word delimiters // Find all compound word delimiters
for (n = nSttPos; n < nEndPos; n++) for (xub_StrLen n = nSttPos; n < nEndPos; ++n)
{ {
if (IsAutoCorrectChar(rTxt[ n ])) if (IsAutoCorrectChar(rTxt[ n ]))
{ {
aDelimiters.push_back( n + 1 ); // Get position of char after delimiter aDelimiters.push_back( n + 1 ); // Get position of char after delimiter
} }
} }
// Decide where to put the terminating delimiter. // Decide where to put the terminating delimiter.
@@ -386,10 +384,10 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const OUString& rTx
// Iterate through the word and all words that compose it. // Iterate through the word and all words that compose it.
// Two capital letters at the beginning of word? // Two capital letters at the beginning of word?
for(n = 0; n < aDelimiters.size() - 1; n++) for (size_t nI = 0; nI < aDelimiters.size() - 1; ++nI)
{ {
nSttPos = aDelimiters[n]; nSttPos = aDelimiters[nI];
nEndPos = aDelimiters[n + 1]; nEndPos = aDelimiters[nI + 1];
if( nSttPos+2 < nEndPos && if( nSttPos+2 < nEndPos &&
IsUpperLetter( rCC.getCharacterType( rTxt, nSttPos )) && IsUpperLetter( rCC.getCharacterType( rTxt, nSttPos )) &&