[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - l10ntools/source

[Thorsten Behrens]

 l10ntools/source/lngmerge.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1df9b405746bac58cabe8c5355c1c085b360a189
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Fri Feb 15 15:03:02 2013 +0100

    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 at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

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 @@ 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++;