summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2015-02-26 16:55:46 -0800
committerAndras Timar <andras.timar@collabora.com>2015-03-04 03:16:00 -0800
commit33484ca7bfd9f02280a8438c802ce494cec8ae88 (patch)
tree7f150efe21ed1237e2a930675085da23d960eb05
parent50006a205ae7602e48c0a6fe1689bbc6012845cf (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/14668 (cherry picked from commit ce7a2502810615b64e83036211e6149313604fff)
-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 },