diff options
author | Mark Hung <marklh9@gmail.com> | 2015-06-24 01:40:13 +0800 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-08-03 16:08:38 +0000 |
commit | fd2bb1847eb3e1edaa590eac9dfaaaf1c64f638a (patch) | |
tree | 3ec6337ffc0db999e40851e742eeef6955280ca1 /writerfilter/source/ooxml/model.xml | |
parent | 183c317f01ccade1c7865e05e608ea7295c8d39e (diff) |
tdf#91594 misinterprets letters from Symbol font in docx files
Fix the issue caused by wrong assumption about symbol chracter
and symbol font attributes order in writerfilter. Also allow
symbols to be displayed if user's language is not Western.
Reviewed-on: https://gerrit.libreoffice.org/16543
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I602d9fbfa79c33c90f655dbf5ee22738b6391ae6
Reviewed-on: https://gerrit.libreoffice.org/17457
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter/source/ooxml/model.xml')
-rw-r--r-- | writerfilter/source/ooxml/model.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 9a8c4d07af77..860655eaa320 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -17840,6 +17840,7 @@ <resource name="CT_Sym" resource="Properties"> <attribute name="font" tokenid="ooxml:CT_Sym_font"/> <attribute name="char" tokenid="ooxml:CT_Sym_char"/> + <action name="end" tokenid="ooxml:EG_RunInnerContent_sym" action="sendPropertiesWithId" sendtokenid="ooxml:EG_RunInnerContent_sym"/> </resource> <resource name="CT_Text" resource="Stream"> <attribute name="xml:space" tokenid="ooxml:CT_Text_space"/> |