summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2015-02-26 16:55:46 -0800
committerEike Rathke <erack@redhat.com>2015-02-27 14:35:09 +0000
commitcb493f5b9d59a82b2aae729f0b02a76f2b9b8e50 (patch)
tree9fe7f403d47d5f382c5b4e8ae509f00f7b81d0e8 /sc/source
parente8f059f918faf8a44787f8f0bdf61217f4439d7f (diff)
tdf#89679 - fix incorrect mapping of font-family-complex and CharFontNameAsian
Change-Id: I4adad1675f2a880e14ed870a3c74e43e8898c371 Reviewed-on: https://gerrit.libreoffice.org/14663 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit cda9ae79e58d861a85128d6a37587b633b956aae) Reviewed-on: https://gerrit.libreoffice.org/14667
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/filter/xml/editattributemap.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/xml/editattributemap.cxx b/sc/source/filter/xml/editattributemap.cxx
index e5feb6bb3f43..fd5de8cc0380 100644
--- a/sc/source/filter/xml/editattributemap.cxx
+++ b/sc/source/filter/xml/editattributemap.cxx
@@ -21,7 +21,7 @@ ScXMLEditAttributeMap::Entry aEntries[] = {
{ XML_NAMESPACE_STYLE, "font-charset-complex", "CharFontCharSetComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_CHAR_SET },
{ XML_NAMESPACE_FO, "font-family", "CharFontName", EE_CHAR_FONTINFO, MID_FONT_FAMILY_NAME },
{ XML_NAMESPACE_STYLE, "font-family-asian", "CharFontNameAsian", EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY_NAME },
- { XML_NAMESPACE_STYLE, "font-family-complex", "CharFontNameAsian", EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY_NAME },
+ { XML_NAMESPACE_STYLE, "font-family-complex", "CharFontNameComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY_NAME },
{ XML_NAMESPACE_STYLE, "font-family-generic", "CharFontFamily", EE_CHAR_FONTINFO, MID_FONT_FAMILY },
{ XML_NAMESPACE_STYLE, "font-family-generic-asian", "CharFontFamilyAsian", EE_CHAR_FONTINFO_CJK, MID_FONT_FAMILY },
{ XML_NAMESPACE_STYLE, "font-family-generic-complex", "CharFontFamilyComplex", EE_CHAR_FONTINFO_CTL, MID_FONT_FAMILY },