From bd6c23298bacc32a49d4352890251a34961cdd81 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 22 Apr 2013 15:25:19 +0000
Subject: [PATCH] Change ODS file line break tag from <text:line-break> to
 </text:p><text:p> so it works in LibreOffice

---
 etemplate/inc/class.bo_merge.inc.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 4892116a7b..3d33ba8090 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -826,8 +826,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;
@@ -1046,7 +1047,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>';
@@ -1340,9 +1341,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;