l10ntools/source/lngmerge.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit f28d71c29b83a0899922c8f32da0fa05458882e2 Author: Andras Timar <[email protected]> Date: Sat Nov 3 00:35:14 2012 +0100 escape quotes, unescape double escaped quotes fdo#56648 Change-Id: Id4135db2ec40865cddab533da15b2705dc7b73d5 diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 6541bd9..3a7a8d5 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -271,7 +271,8 @@ sal_Bool LngParser::Merge( rtl::OString sText1( sLang ); sText1 += " = \""; - sText1 += sNewText; + // escape quotes, unescape double escaped quotes fdo#56648 + sText1 += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\""); sText1 += "\""; *pLine = sText1; Text[ sLang ] = sNewText; @@ -306,7 +307,8 @@ sal_Bool LngParser::Merge( rtl::OString sLine; sLine += sCur; sLine += " = \""; - sLine += sNewText; + // escape quotes, unescape double escaped quotes fdo#56648 + sLine += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\""); sLine += "\""; nLastLangPos++; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
