Kaydet (Commit) b5528965 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

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
üst 30e5a445
...@@ -1197,10 +1197,6 @@ void Export::WriteToMerged(const OString &rText , bool bSDFContent) ...@@ -1197,10 +1197,6 @@ void Export::WriteToMerged(const OString &rText , bool bSDFContent)
void Export::ConvertMergeContent( OString &rText ) 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 rText = rText.replaceAll("\\\'","\'"); // Temporary: until PO files contain escaped single quotes
// (Maybe next PO update solve this) // (Maybe next PO update solve this)
rText = rText =
...@@ -1208,11 +1204,7 @@ void Export::ConvertMergeContent( OString &rText ) ...@@ -1208,11 +1204,7 @@ void Export::ConvertMergeContent( OString &rText )
rText.replaceAll("","\\0x7F"), rText.replaceAll("","\\0x7F"),
"\n""\t""\\""\"","\\n""\\t""\\\\""\\\""); "\n""\t""\\""\"","\\n""\\t""\\\\""\\\"");
if ( bNoOpen ) rText = "\"" + rText + "\"";
rText = "\"" + rText;
if ( bNoClose )
rText += "\"";
} }
void Export::ConvertExportContent( OString& rText ) void Export::ConvertExportContent( OString& rText )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment