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

qtz handling in ulfex

Browse Source 
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
This commit is contained in:
Andras Timar
2013-11-15 21:07:57 +01:00
parent ec6d0deca7
commit f64ef0b43a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
l10ntools/source/lngmerge.cxx
View File

@@ -244,7 +244,7 @@ sal_Bool LngParser::Merge(
OString sNewText; OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sLang, sal_True ); pEntrys->GetText( sNewText, STRING_TYP_TEXT, sLang, sal_True );
if( sLang == "qtz" ) if( sLang == "qtz" )
sNewText = sNewText.copy(sNewText.indexOf('|') + 2); continue;
if ( !sNewText.isEmpty()) { if ( !sNewText.isEmpty()) {
OString *pLine = (*pLines)[ nPos ]; OString *pLine = (*pLines)[ nPos ];
@@ -282,7 +282,7 @@ sal_Bool LngParser::Merge(
OString sNewText; OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur, sal_True ); pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur, sal_True );
if( sCur == "qtz" ) if( sCur == "qtz" )
sNewText = sNewText.copy(sNewText.indexOf('|') + 2); continue;
if ( !sNewText.isEmpty() && sCur != "x-comment") if ( !sNewText.isEmpty() && sCur != "x-comment")
{ {
OString sLine; OString sLine;