l10ntools/source/lngmerge.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit f64ef0b43a5cd97657cffa2cfb415d523d55095c Author: Andras Timar <andras.ti...@collabora.com> Date: Fri Nov 15 21:07:57 2013 +0100 qtz handling in ulfex If we don't want to use qtz codes in .ulf files, then why do we write out qtz language with en-US content? In fact this patch would not be necessary, if I didn't find a build breaker bug, somehow sNewText was empty for certain strings, and the sNewText.copy(sNewText.indexOf('|') + 2) failed. Change-Id: Idf377e61391eb08ecb692a7c404d190659b97575 diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 4913bc4..fc8aa7b 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -244,7 +244,7 @@ sal_Bool LngParser::Merge( OString sNewText; pEntrys->GetText( sNewText, STRING_TYP_TEXT, sLang, sal_True ); if( sLang == "qtz" ) - sNewText = sNewText.copy(sNewText.indexOf('|') + 2); + continue; if ( !sNewText.isEmpty()) { OString *pLine = (*pLines)[ nPos ]; @@ -282,7 +282,7 @@ sal_Bool LngParser::Merge( OString sNewText; pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur, sal_True ); if( sCur == "qtz" ) - sNewText = sNewText.copy(sNewText.indexOf('|') + 2); + continue; if ( !sNewText.isEmpty() && sCur != "x-comment") { OString sLine; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits