From 6c4ea8cb383ad5f77f5099f9d55c3daacb20f18f Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Mon, 23 Apr 2018 09:24:49 -0600
Subject: [PATCH] Api - Stop adding calcext:value-type attributes when merging
 to spreadsheets, they're no longer used and can cause a warning with recent
 templates

---
 api/src/Storage/Merge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index b0a95ce145..87fb17727d 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -1195,7 +1195,7 @@ abstract class Merge
 		{
 			case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
 				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)(?:calcext:value-type="[^"]+")?>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\3>.?<\/table:table-cell>/s';
-				$replacement = '<table:table-cell$1office:value-type="float" office:value="$4"$2 calcext:value-type="float"><$3>$4</$3></table:table-cell>';
+				$replacement = '<table:table-cell$1office:value-type="float" office:value="$4"$2><$3>$4</$3></table:table-cell>';
 				break;
 			case 'application/vnd.oasis.opendocument.text':		// tables in open office writer
 				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\3>.?<\/table:table-cell>/s';