diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index 1dae890d28..84d6015abc 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -825,8 +825,9 @@ abstract class bo_merge case 'text/rtf': return $contentstart.implode('\\par \\page\\pard\\plain',$contentrepeatpages).$contentend; case 'application/vnd.oasis.opendocument.text': - case 'application/vnd.oasis.opendocument.spreadsheet': return $contentstart.implode('',$contentrepeatpages).$contentend; + case 'application/vnd.oasis.opendocument.spreadsheet': + return $contentstart.implode('',$contentrepeatpages).$contentend; case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': return $contentstart.implode('',$contentrepeatpages).$contentend; @@ -1045,7 +1046,7 @@ abstract class bo_merge $break = ''; break; case 'application/vnd.oasis.opendocument.spreadsheet': // open office calc - $break = ''; + $break = ''; break; case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': // ms word 2007 $break = ''; @@ -1339,9 +1340,11 @@ abstract class bo_merge $LF = '}\par \pard\plain{'; break; case 'application/vnd.oasis.opendocument.text': - case 'application/vnd.oasis.opendocument.spreadsheet': $LF =''; break; + case 'application/vnd.oasis.opendocument.spreadsheet': // open office calc + $LF = ''; + break; case 'application/xmlExcel.Sheet': // Excel 2003 $LF = ' '; break;