summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2013-02-15 15:03:02 +0100
committerAndras Timar <atimar@suse.com>2013-02-16 07:58:04 +0000
commit1df9b405746bac58cabe8c5355c1c085b360a189 (patch)
treecaa34a70e777c42d1fba8632bd26bbf7ed651c2c
parenteaaa621a4d132ef864c23c2bf812780ac43bbe8c (diff)
Only escape double-quotes for ulf files.
On second thought, this was needlessly overbroad. Missed the fact that the code is strictly for ulf. Change-Id: I96773d6e2a9af473e8c8309421b4900c0b76667f Reviewed-on: https://gerrit.libreoffice.org/2172 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
-rw-r--r--l10ntools/source/lngmerge.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 812c43667b35..71f68effccdf 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -269,7 +269,7 @@ sal_Bool LngParser::Merge(
rtl::OString sText1( sLang );
sText1 += " = \"";
// escape quotes, unescape double escaped quotes fdo#56648
- sText1 += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\"").replaceAll("\'","\\\'").replaceAll("\\\\\'","\\\'");
+ sText1 += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\"");
sText1 += "\"";
*pLine = sText1;
Text[ sLang ] = sNewText;
@@ -307,7 +307,7 @@ sal_Bool LngParser::Merge(
sLine += sCur;
sLine += " = \"";
// escape quotes, unescape double escaped quotes fdo#56648
- sLine += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\"").replaceAll("\'","\\\'").replaceAll("\\\\\'","\\\'");
+ sLine += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\"");
sLine += "\"";
nLastLangPos++;