extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 14:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change ODS file line break tag from <text:line-break> to </text:p><text:p> so it works in LibreOffice

Browse Source
This commit is contained in:
Nathan Gray 2013-04-23 14:11:43 +00:00
parent 92971476e3
commit 6e2df01d29
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/inc/class.bo_merge.inc.php
View File

@ -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('<text:line-break />',$contentrepeatpages).$contentend;
case 'application/vnd.oasis.opendocument.spreadsheet':
return $contentstart.implode('</text:p><text:p>',$contentrepeatpages).$contentend;
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
return $contentstart.implode('<w:br w:type="page" />',$contentrepeatpages).$contentend;
@ -1045,7 +1046,7 @@ abstract class bo_merge
$break = '<text:line-break/>';
break;
case 'application/vnd.oasis.opendocument.spreadsheet': // open office calc
$break = '<text:line-break/>';
$break = '</text:p><text:p>';
break;
case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': // ms word 2007
$break = '</w:t><w:br/><w:t>';
@ -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 ='<text:line-break/>';
break;
case 'application/vnd.oasis.opendocument.spreadsheet': // open office calc
$LF = '</text:p><text:p>';
break;
case 'application/xmlExcel.Sheet': // Excel 2003
$LF = '&#10;';
break;