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

iterateCodePoints() on empty string is no good anymore

Browse Source 
Change-Id: Id2ddbbff90f3cd32c03c7623af6d458717c7e8a8
This commit is contained in:
Eike Rathke
2013-10-29 00:50:46 +01:00
parent 20e0afa760
commit 2830bf9af9
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
i18npool/source/localedata/LocaleNode.cxx
View File

@@ -1217,19 +1217,23 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
}
// Rudimentary check if a pattern interferes with decimal number.
nIndex = 0;
sal_uInt32 cDecSep = aDecSep.iterateCodePoints( &nIndex);
for (vector<OUString>::const_iterator aIt = theDateAcceptancePatterns.begin();
aIt != theDateAcceptancePatterns.end(); ++aIt)
// But only if not inherited in which case we don't have aDecSep here.
if (!aDecSep.isEmpty())
{
if ((*aIt).getLength() == (cDecSep <= 0xffff ? 3 : 4))
nIndex = 0;
sal_uInt32 cDecSep = aDecSep.iterateCodePoints( &nIndex);
for (vector<OUString>::const_iterator aIt = theDateAcceptancePatterns.begin();
aIt != theDateAcceptancePatterns.end(); ++aIt)
{
nIndex = 1;
if ((*aIt).iterateCodePoints( &nIndex) == cDecSep)
if ((*aIt).getLength() == (cDecSep <= 0xffff ? 3 : 4))
{
++nError;
fprintf( stderr, "Error: Date acceptance pattern '%s' matches decimal number '#%s#'\n",
OSTR( *aIt), OSTR( aDecSep));
nIndex = 1;
if ((*aIt).iterateCodePoints( &nIndex) == cDecSep)
{
++nError;
fprintf( stderr, "Error: Date acceptance pattern '%s' matches decimal number '#%s#'\n",
OSTR( *aIt), OSTR( aDecSep));
}
}
}
}