[Libreoffice-commits] .: writerfilter/source

Cédric Bosdonnat cbosdo at kemper.freedesktop.org
Thu Dec 9 01:41:55 PST 2010


 writerfilter/source/ooxml/model.xml |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

New commits:
commit fdfe1bfafdffb0fc0be8e6807ca9402bb90e20c9
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Dec 9 10:39:16 2010 +0100

    [Docx] n#513479: import start/end values for ST_Jc

diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index e595e7b..65f5fa1 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -8013,9 +8013,13 @@
         <list>
           <xs:documentation>Justification</xs:documentation>
           <choice>
-            <!-- Left Justification -->
+            <!-- Align To Leading Edge -->
+            <value>start</value>
+            <!-- Align To Trailing Edge -->
+            <value>end</value>
+            <!-- Left Justification (ecma) -->
             <value>left</value>
-            <!-- Right -->
+            <!-- Right (ecma) -->
             <value>right</value>
             <!-- Center (Equation) -->
             <value>center</value>
@@ -8306,6 +8310,8 @@
       <attribute name="val" tokenid="ooxml:CT_Style_val" action="setValue"/>
     </resource>
     <resource name="ST_Jc" resource="List" generated="yes">
+      <value name="start" tokenid="ooxml:Value_math_ST_Jc_start">left</value>
+      <value name="end" tokenid="ooxml:Value_math_ST_Jc_end">right</value>
       <value name="left" tokenid="ooxml:Value_math_ST_Jc_left">left</value>
       <value name="right" tokenid="ooxml:Value_math_ST_Jc_right">right</value>
       <value name="center" tokenid="ooxml:Value_math_ST_Jc_center">center</value>
@@ -13917,11 +13923,15 @@
         <list>
           <xs:documentation>Horizontal Alignment Type</xs:documentation>
           <choice>
-            <!-- Align Left -->
+            <!-- Align To Leading Edge -->
+            <value>start</value>
+            <!-- Align To Trailing Edge -->
+            <value>end</value>
+            <!-- Align Left (ecma) -->
             <value>left</value>
             <!-- Align Center -->
             <value>center</value>
-            <!-- Align Right -->
+            <!-- Align Right (ecma) -->
             <value>right</value>
             <!-- Justified -->
             <value>both</value>
@@ -21636,8 +21646,10 @@
     </resource>
     <resource name="ST_Jc" resource="List">
       <value tokenid="0">left</value>
-      <value tokenid="1">center</value>
       <value tokenid="2">right</value>
+      <value tokenid="0">start</value>
+      <value tokenid="1">center</value>
+      <value tokenid="2">end</value>
       <value tokenid="3">both</value>
       <value tokenid="ooxml:Value_ST_Jc_mediumKashida">mediumKashida</value>
       <value tokenid="ooxml:Value_ST_Jc_distribute">distribute</value>


More information about the Libreoffice-commits mailing list