From cf28abed08109f5d7937c94670194f97a7e6f168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= <tomaz.vajngerl@collabora.com>
Date: Fri, 28 Feb 2014 12:54:07 +0100
Subject: [PATCH] writerfilter: extend tokens and model.xml for
 w:compatSettings

Word stores compatibility mode and additional compatibility
settings (like enableOpenTypeFeatures) in w:compatSetting. This
needs to be preserved as well.

Change-Id: I40895cc00952b7c3799edff0bf7f4328106305a1
---
 oox/source/token/tokens.txt         |  1 +
 writerfilter/source/ooxml/model.xml | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 133cbd23fa53..ff5466c247a2 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -1288,6 +1288,7 @@ compass
 compat
 compatLnSpc
 compatMode
+compatSetting
 complex
 composite
 compressPunctuation
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index bc56233a00e1..187820fa98e7 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -20637,6 +20637,22 @@
             <ref name="CT_OnOff"/>
           </element>
         </optional>
+        <optional>
+          <element name="compatSetting">
+            <ref name="CT_CompatSetting"/>
+          </element>
+        </optional>
+      </define>
+      <define name="CT_CompatSetting">
+        <attribute name="name">
+          <ref name="ST_String"/>
+        </attribute>
+        <attribute name="uri">
+          <ref name="ST_String"/>
+        </attribute>
+        <attribute name="val">
+          <ref name="ST_String"/>
+        </attribute>
       </define>
       <define name="CT_DocVar">
         <attribute name="name">
@@ -24934,6 +24950,12 @@
       <element name="doNotVertAlignInTxbx" tokenid="ooxml:CT_Compat_doNotVertAlignInTxbx"/>
       <element name="useAnsiKerningPairs" tokenid="ooxml:CT_Compat_useAnsiKerningPairs"/>
       <element name="cachedColBalance" tokenid="ooxml:CT_Compat_cachedColBalance"/>
+      <element name="compatSetting" tokenid="ooxml:CT_Compat_compatSetting"/>
+    </resource>
+    <resource name="CT_CompatSetting" resource="Properties" tag="document">
+      <attribute name="name" tokenid="ooxml:CT_CompatSetting_name"/>
+      <attribute name="uri" tokenid="ooxml:CT_CompatSetting_uri"/>
+      <attribute name="val" tokenid="ooxml:CT_CompatSetting_val"/>
     </resource>
     <resource name="CT_DocVar" resource="Properties" tag="document">
       <attribute name="name" tokenid="ooxml:CT_DocVar_name"/>