From bb00c4217d04100d4254e2e7d5881e4be1cbd453 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 24 Aug 2011 17:29:03 +0000
Subject: [PATCH] Don't fail if table has properties, support table borders in
 docx files

---
 etemplate/inc/class.bo_merge.inc.php      |  4 ++--
 etemplate/templates/default/msoffice.xslt | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php
index 8f1037f700..f94cedd9b4 100644
--- a/etemplate/inc/class.bo_merge.inc.php
+++ b/etemplate/inc/class.bo_merge.inc.php
@@ -357,7 +357,7 @@ abstract class bo_merge
 			case 'application/vnd.oasis.opendocument.spreadsheet':
 				// It seems easier to split the parent tags here
 				$replace_tags = array(
-					'/<(ol|ul|table)>/' => '</text:p><$1>',
+					'/<(ol|ul|table)( [^>]*)?>/' => '</text:p><$1$2>',
 					'/<\/(ol|ul|table)>/' => '</$1><text:p>',
 					//'/<(li)(.*?)>(.*?)<\/\1>/' => '<$1 $2>$3</$1>',
 				);
@@ -378,7 +378,7 @@ abstract class bo_merge
 				);
 				// It seems easier to split the parent tags here
 				$replace_tags = array(
-					'/<(ol|ul|table)(.*?)>/' => '</w:t></w:r></w:p><$1$2>',
+					'/<(ol|ul|table)( [^>]*)?>/' => '</w:t></w:r></w:p><$1$2>',
 					'/<\/(ol|ul|table)>/' => '</$1><w:p><w:r><w:t>',
 					'/<(li)(.*?)>(.*?)<\/\1>/' => '<$1 $2>$3</$1>',
 /*
diff --git a/etemplate/templates/default/msoffice.xslt b/etemplate/templates/default/msoffice.xslt
index 2f41ff3d90..be4b1ee6f2 100644
--- a/etemplate/templates/default/msoffice.xslt
+++ b/etemplate/templates/default/msoffice.xslt
@@ -223,6 +223,15 @@ Breakers
 			<w:tblPr>
 				<w:tblW w:type="dxa" w:w="9972"/>
 				<w:jc w:value="left"/>
+				<xsl:if test="@border &gt; 0">
+					<w:tblBorders>
+						<xsl:variable name="width" select="number(@border)*2"/>
+						<w:top w:color="000000" w:space="0" w:sz="{$width}" w:val="single"/>
+						<w:left w:color="000000" w:space="0" w:sz="{$width}" w:val="single"/>
+						<w:bottom w:color="000000" w:space="0" w:sz="{$width}" w:val="single"/>
+						<w:right w:color="000000" w:space="0" w:sz="{$width}" w:val="single"/>
+					</w:tblBorders>
+				</xsl:if>
 			</w:tblPr>
 			<w:tblGrid>
 				<xsl:for-each select="./tr[1]/td">
@@ -232,7 +241,18 @@ Breakers
 		<xsl:for-each select="./tr">
 			<w:tr>
 			<xsl:for-each select="./td">
-				<w:tc><w:p><w:r><w:t><xsl:apply-templates select="child::node()" /></w:t></w:r></w:p></w:tc>
+				<w:tc>
+				<xsl:if test="../../@border &gt; 0">
+					<w:tcPr><w:tcBorders>
+						<xsl:variable name="width" select="number(../../@border)*2"/>
+						<w:top w:color="000000" w:space="0" w:sz="{$width}" w:val="single"/>
+						<w:left w:color="000000" w:space="0" w:sz="{$width}" w:val="single"/>
+						<w:bottom w:color="000000" w:space="0" w:sz="{$width}" w:val="single"/>
+						<w:right w:color="000000" w:space="0" w:sz="{$width}" w:val="single"/>
+					</w:tcBorders></w:tcPr>
+				</xsl:if>
+				<w:p><w:r><w:t><xsl:apply-templates select="child::node()" /></w:t></w:r></w:p>
+				</w:tc>
 			</xsl:for-each>
 			</w:tr>
 		</xsl:for-each>