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

[Thorsten Behrens]

 l10ntools/source/stringmerge.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eaaa621a4d132ef864c23c2bf812780ac43bbe8c
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Fri Feb 15 13:45:01 2013 +0100

    Proper escaping of quotes for android xml resource files.
    
    Change-Id: I9f76986465af5798f1451d44af6765f4e5d1bb09
    Reviewed-on: https://gerrit.libreoffice.org/2173
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 26aabcb..378548e 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -161,7 +161,7 @@ void StringParser::Merge(
             {
                 OString sNewText;
                 pEntrys->GetText( sNewText, STRING_TYP_TEXT, m_sLang );
-                sNewText = sNewText.replaceAll("\"",""").replaceAll("\\\\\"","\\\"").replaceAll("\'","'").replaceAll("\\\\\'","\\\'");
+                sNewText = sNewText.replaceAll("\'","\\\'").replaceAll("\"","\\\"");
                 xmlNodeSetContent(
                     pCurrent,
                     xmlEncodeSpecialChars( NULL,