diff options
| author | Andras Timar <atimar@suse.com> | 2012-12-12 10:07:35 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-12-14 12:20:13 +0100 |
| commit | c7b1a2fe811f1d5a233cd790cec9067cea246845 (patch) | |
| tree | 7d7a4ea48a67b54f8d1848e75db97341fdbf4275 /l10ntools | |
| parent | a9a734a680dda8c177f92cf2f14061c9b785ec8d (diff) | |
Make KeyID (qtz) work again
Conflicts:
configure.ac
Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/lngmerge.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 9da45b606aeb..71f68effccdf 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -184,7 +184,7 @@ sal_Bool LngParser::Merge( } nError = LNG_OK; - MergeDataFile aMergeDataFile( rSDFFile, sSource, false, false ); + MergeDataFile aMergeDataFile( rSDFFile, sSource, false, true ); rtl::OString sTmp( Export::sLanguages ); if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")) ) Export::SetLanguages( aMergeDataFile.GetLanguages() ); @@ -260,6 +260,8 @@ sal_Bool LngParser::Merge( { rtl::OString sNewText; pEntrys->GetText( sNewText, STRING_TYP_TEXT, sLang, sal_True ); + if( sLang == "qtz" ) + sNewText = sNewText.copy(6); if ( !sNewText.isEmpty()) { rtl::OString *pLine = (*pLines)[ nPos ]; @@ -296,6 +298,8 @@ sal_Bool LngParser::Merge( rtl::OString sNewText; pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur, sal_True ); + if( sCur == "qtz" ) + sNewText = sNewText.copy(6); if (( !sNewText.isEmpty()) && !(( sCur.equalsL(RTL_CONSTASCII_STRINGPARAM("x-comment"))) && ( sNewText == "-" ))) { |