l10ntools/source/lngmerge.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit c1b4077d1ffa57d325bf1149ac198d91cf981e3b
Author: Andras Timar <ati...@suse.com>
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 b0282f5..00a58d2 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -264,7 +264,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;
@@ -299,7 +300,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
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
