Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/2172 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/2172/1 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 --- M l10ntools/source/lngmerge.cxx 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 812c436..71f68ef 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -269,7 +269,7 @@ 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 @@ sLine += sCur; sLine += " = \""; // escape quotes, unescape double escaped quotes fdo#56648 - sLine += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\"").replaceAll("\'","\\\'").replaceAll("\\\\\'","\\\'"); + sLine += sNewText.replaceAll("\"","\\\"").replaceAll("\\\\\"","\\\""); sLine += "\""; nLastLangPos++; -- To view, visit https://gerrit.libreoffice.org/2172 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96773d6e2a9af473e8c8309421b4900c0b76667f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Thorsten Behrens <tbehr...@suse.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice