diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-08-15 10:40:35 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-08-15 17:09:11 +0200 |
| commit | 26d9efd36a16d2095d8fb885290c6816082ec814 (patch) | |
| tree | fb5dd9394bd1e96e974dd91b0d4951d2492de7ab /writerfilter/source/ooxml/model.xml | |
| parent | 69fd51d606619d90f291059b1cd82ec65a2c91e5 (diff) | |
DOCX import: handle w:leftFromText and w:rightFromText for floating tables
Left margin wasn't implemented, that's simple. Right margin of the table
was set to the cell margin in commit
53d27a30ce5f2c9f7d37a4089286116854c16215, which turns out to be wrong:
it's true that the right margin should be >0, but not because of the
cell margin but because of the table margin. The new behavior matches
what the binary import always did.
Change-Id: Ifc24e4f086c49d5d575defdfca1d27e497fa03dc
Diffstat (limited to 'writerfilter/source/ooxml/model.xml')
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 402323fc1ff6..ea8f082c4d9c 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -17985,11 +17985,11 @@ </define> <define name="CT_TblPPr"> <attribute name="leftFromText"> - <text/> + <ref name="ST_SignedTwipsMeasure"/> <xs:documentation>Distance From Left of Table to Text</xs:documentation> </attribute> <attribute name="rightFromText"> - <text/> + <ref name="ST_SignedTwipsMeasure"/> <xs:documentation>(Distance From Right of Table to Text</xs:documentation> </attribute> <attribute name="topFromText"> @@ -22913,6 +22913,8 @@ <attribute name="tblpXSpec" tokenid="ooxml:CT_TblPPr_tblpXSpec"/> <attribute name="tblpY" tokenid="ooxml:CT_TblPPr_tblpY"/> <attribute name="tblpX" tokenid="ooxml:CT_TblPPr_tblpX"/> + <attribute name="leftFromText" tokenid="ooxml:CT_TblPPr_leftFromText"/> + <attribute name="rightFromText" tokenid="ooxml:CT_TblPPr_rightFromText"/> <attribute name="topFromText" tokenid="ooxml:CT_TblPPr_topFromText"/> <attribute name="bottomFromText" tokenid="ooxml:CT_TblPPr_bottomFromText"/> </resource> |