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

[Zolnai Tamás]

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

New commits:
commit a3eca34a471e4111877bb35170f90f20463a02c3
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun May 26 08:30:22 2013 +0200

    Escape quotes during stringex export
    
    Change-Id: If53afd3743f44bcfffab33122657d14c0f4aba1e

diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 34c978b..9e3fa7a 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -71,7 +71,7 @@ void StringParser::Extract( const OString& rPOFile )
             xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)("name"));
             xmlChar* pText = xmlNodeGetContent(pCurrent);
             const OString sTemp =
-                helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t","\n""\t");
+                helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t""\\\"""\\\'","\n""\t""\"""\'");
             common::writePoEntry(
                 "Stringex", aPOStream, m_pSource->name, "string",
                 helper::xmlStrToOString( pID ), OString(), OString(),
@@ -130,7 +130,7 @@ void StringParser::Merge(
             {
                 xmlChar* pText = xmlNodeGetContent(pCurrent);
                 const OString sOriginText =
-                    helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t","\n""\t");
+                    helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t""\\\"""\\\'","\n""\t""\"""\'");
                 xmlFree( pText );
                 sNewText = MergeEntrys::GetQTZText(aResData, sOriginText);
             }