[Libreoffice-commits] core.git: writerfilter/source

[Adam Co]

 writerfilter/source/ooxml/model.xml |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d5df1355a1b8f3a2bdc5ce18f2da1e6ee0384d0e
Author: Adam Co <rattles2013 at gmail.com>
Date:   Tue Sep 16 17:42:39 2014 +0300

    Added some tweaks to 'model.xml' file
    
    Change-Id: Ide7ba56d53c9565e0cceb6276ee07ecf9545f07b
    Reviewed-on: https://gerrit.libreoffice.org/11473
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 6953b2d..019f835 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -18210,6 +18210,7 @@
       <element name="hideMark" tokenid="ooxml:CT_TcPrBase_hideMark"/>
       <element name="cellDel" tokenid="ooxml:CT_TcPrBase_cellDel"/>
       <element name="cellIns" tokenid="ooxml:CT_TcPrBase_cellIns"/>
+      <element name="cellMerge" tokenid="ooxml:CT_TcPrBase_cellMerge"/>
     </resource>
     <resource name="CT_TcPr" resource="Properties">
       <element name="tcPrChange" tokenid="ooxml:CT_TcPr_tcPrChange"/>
@@ -18325,6 +18326,9 @@
       <action name="end" action="propagateTableProperties"/>
       <action name="end" action="clearProps"/>
     </resource>
+    <resource name="CT_TblPrEx" resource="Properties">
+        <element name="tblPrExChange" tokenid="ooxml:CT_TblPrEx_tblPrExChange"/>
+    </resource>
     <resource name="CT_Tbl" resource="TextTable"/>
     <resource name="CT_TblLook" resource="Properties">
       <attribute name="firstRow" tokenid="ooxml:CT_TblLook_firstRow"/>