From 0eb0c7308ad57f4a20b5691d450b5185e52475f6 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Thu, 13 Jul 2017 09:08:56 +0300
Subject: A temporary workaround for out-of-order (in-paragraph) tbl on OOXML

This allows for import the data in such tables (previously, this text
was simply dropped, causing dataloss). Layout problems are not fixed
yet.

Change-Id: Id7422adfe0998d1e2adcd4bf0b0e0a1dd7ed37bf
Reviewed-on: https://gerrit.libreoffice.org/40105
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
---
 writerfilter/source/ooxml/model.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'writerfilter/source/ooxml/model.xml')

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 56aff376c8f9..a5c9a8afabc9 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -14183,6 +14183,10 @@
           <ref name="CT_Br_OutOfOrder"/>
         </element>
         <!-- end tdf#108714 -->
+        <!-- allow <w:tbl> at paragraph level (despite this is illegal according to ECMA-376-1:2016) - bug-to-bug compatibility with Word -->
+        <element name="tbl">
+          <ref name="CT_P_Tbl"/>
+        </element>
       </define>
       <define name="ST_TblWidth">
         <choice>
@@ -14696,6 +14700,17 @@
         </element>
         <ref name="EG_ContentRowContent"/>
       </define>
+      <!-- Special element - copy of usual CT_Tbl, but only used as direct child of CT_P -->
+      <define name="CT_P_Tbl">
+        <ref name="EG_RangeMarkupElements"/>
+        <element name="tblPr">
+          <ref name="CT_TblPr"/>
+        </element>
+        <element name="tblGrid">
+          <ref name="CT_TblGrid"/>
+        </element>
+        <ref name="EG_ContentRowContent"/>
+      </define>
       <define name="CT_TblLook">
         <attribute name="firstRow">
           <ref name="ST_OnOff"/>
@@ -18426,6 +18441,11 @@
         <element name="tblPrExChange" tokenid="ooxml:CT_TblPrEx_tblPrExChange"/>
     </resource>
     <resource name="CT_Tbl" resource="TextTable"/>
+    <!-- allow <w:tbl> at paragraph level (despite this is illegal according to ECMA-376-1:2016) - bug-to-bug compatibility with Word -->
+    <resource name="CT_P_Tbl" resource="TextTable">
+      <action name="start" action="start_P_Tbl"/>
+      <action name="end" action="end_P_Tbl"/>
+    </resource>
     <resource name="CT_TblLook" resource="Properties">
       <attribute name="firstRow" tokenid="ooxml:CT_TblLook_firstRow"/>
       <attribute name="lastRow" tokenid="ooxml:CT_TblLook_lastRow"/>
-- 
cgit v1.2.3