summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorAdam Co <rattles2013@gmail.com>2013-06-23 18:17:49 +0300
committerMiklos Vajna <vmiklos@suse.cz>2013-06-24 09:34:18 +0000
commit6edcfde748604863dba40e982effab38d0cb0589 (patch)
treed40aae4520b6277222b9f76c7917f316462f9f4b /writerfilter
parenta659ac906aa2d0dfd6d10e40d8a5a6d2d70cc8fc (diff)
fdo#56679, fdo#65710 : fix for import and export of underline color
Change-Id: Ifc45900d73802ef99c55d7af4ee04314dd04f1c5 Reviewed-on: https://gerrit.libreoffice.org/4459 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/ooxml/model.xml8
1 files changed, 6 insertions, 2 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index c9f2d4f962ed..e9b2d6a5d998 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -12833,11 +12833,15 @@
</list>
</define>
<define name="CT_Underline">
- <optional><attribute name="val"><ref name="ST_Underline"/><xs:documentation>Underline Style</xs:documentation></attribute>ST_String
+ <optional>
+ <attribute name="val">
+ <ref name="ST_Underline"/>
+ <xs:documentation>Underline Style</xs:documentation>
+ </attribute>
</optional>
<optional>
<attribute name="color">
- <text/>
+ <ref name="ST_HexColor"/>
<xs:documentation>Underline Color</xs:documentation>
</attribute>
</optional>