diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2012-10-03 12:37:19 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-03 19:44:15 +0200 |
| commit | 2146c00da07a0c632028cf41c4c1a5a687d82ffe (patch) | |
| tree | 5c69ab378c87d40382c698a4be3a6bf82c2c538d | |
| parent | 8ca8ea20e0aeeb26f085cbf331bf92003e1e9648 (diff) | |
Ulfex ignores comments during extraction too
During string extraction this does not cause
real problem but causes unnecessary operations.
Plus make isNextGroup not to change sLine_in
parameter.
Change-Id: I3db6a94ef320c096a7519f7f83dd4080d0588459
| -rw-r--r-- | l10ntools/source/lngmerge.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index fcab6966aef1..b0282f5fb4d7 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -146,12 +146,12 @@ void LngParser::WriteSDF(std::ofstream &aSDFStream, } } -bool LngParser::isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in) +bool LngParser::isNextGroup(rtl::OString &sGroup_out, const rtl::OString &sLine_in) { - sLine_in = sLine_in.trim(); - if ((sLine_in[0] == '[') && (sLine_in[sLine_in.getLength() - 1] == ']')) + const OString sLineTrim = sLine_in.trim(); + if ((sLineTrim[0] == '[') && (sLineTrim[sLineTrim.getLength() - 1] == ']')) { - sGroup_out = getBracketedContent(sLine_in).trim(); + sGroup_out = getBracketedContent(sLineTrim).trim(); return true; } return false; @@ -160,10 +160,13 @@ bool LngParser::isNextGroup(rtl::OString &sGroup_out, rtl::OString &sLine_in) void LngParser::ReadLine(const rtl::OString &rLine_in, OStringHashMap &rText_inout) { - rtl::OString sLang(rLine_in.getToken(0, '=').trim()); - if (!sLang.isEmpty()) { - rtl::OString sText(rLine_in.getToken(1, '"')); - rText_inout[sLang] = sText; + if (!rLine_in.match(" *") && !rLine_in.match("/*")) + { + rtl::OString sLang(rLine_in.getToken(0, '=').trim()); + if (!sLang.isEmpty()) { + rtl::OString sText(rLine_in.getToken(1, '"')); + rText_inout[sLang] = sText; + } } } |