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

[Zolnai Tamás]

 l10ntools/source/export.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit f60520f7b887dcaa4663fb408660e87e6881352a
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sat Jun 22 18:54:01 2013 +0200

    fdo#66048: export cannot handle starting \\\"
    
    Old stuff. By now we always have to add double
    quotes to the edges of text.
    
    Change-Id: I14ca7283d723bf87fb232288d92e53393e90103e
    Signed-off-by: Andras Timar <atimar at suse.com>

diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index c15d81f..44672df 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1197,10 +1197,6 @@ void Export::WriteToMerged(const OString &rText , bool bSDFContent)
 
 void Export::ConvertMergeContent( OString &rText )
 {
-    sal_Bool bNoOpen = ( rText.indexOf( "\\\"" ) != 0 );
-    sal_Bool bNoClose = !rText.endsWith("\\\"");
-
-
     rText = rText.replaceAll("\\\'","\'"); // Temporary: until PO files contain escaped single quotes
                                             // (Maybe next PO update solve this)
     rText =
@@ -1208,11 +1204,7 @@ void Export::ConvertMergeContent( OString &rText )
             rText.replaceAll("","\\0x7F"),
             "\n""\t""\\""\"","\\n""\\t""\\\\""\\\"");
 
-    if ( bNoOpen )
-        rText = "\"" + rText;
-
-    if ( bNoClose )
-        rText += "\"";
+    rText = "\"" + rText + "\"";
 }
 
 void Export::ConvertExportContent( OString& rText )