l10ntools/source/cfgmerge.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 66da602fb911d73e89fa7662dcea5840b449241f Author: Matteo Casalin <matteo.casa...@yahoo.com> AuthorDate: Sat Feb 23 19:21:40 2019 +0100 Commit: Matteo Casalin <matteo.casa...@yahoo.com> CommitDate: Thu Mar 14 19:22:17 2019 +0100 Fix TRUE to sal_True conversion in string This would lead to always false condition, since that text should be uppercase. Introduced in d210c6ccc30466e98240c1409df0550514668d68. Reduce parentheses while at it. Change-Id: Iec9cbbfd0a596ad1d4dcba50aa3a5c00a54ef425 Reviewed-on: https://gerrit.libreoffice.org/69234 Tested-by: Jenkins Reviewed-by: Matteo Casalin <matteo.casa...@yahoo.com> diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index ebe8487aa599..0c1167da1a3b 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -234,8 +234,8 @@ void CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken ) if ( sSearch == "cfg:name=" ) { OString sTemp( sToken.toAsciiUpperCase() ); - bLocalize = (( sTemp.indexOf( "CFG:TYPE=\"STRING\"" ) != -1 ) && - ( sTemp.indexOf( "CFG:LOCALIZED=\"sal_True\"" ) != -1 )); + bLocalize = sTemp.indexOf("CFG:TYPE=\"STRING\"")>=0 + && sTemp.indexOf( "CFG:LOCALIZED=\"TRUE\"" )>=0; } } else if ( sTokenName == "label" ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits