[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

[Mark Hung]

 sc/source/filter/xml/editattributemap.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cb493f5b9d59a82b2aae729f0b02a76f2b9b8e50
Author: Mark Hung <mark...@gmail.com>
Date:   Thu Feb 26 16:55:46 2015 -0800

    tdf#89679 - fix incorrect mapping of font-family-complex and 
CharFontNameAsian
    
    Change-Id: I4adad1675f2a880e14ed870a3c74e43e8898c371
    Reviewed-on: https://gerrit.libreoffice.org/14663
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Eike Rathke <er...@redhat.com>
    (cherry picked from commit cda9ae79e58d861a85128d6a37587b633b956aae)
    Reviewed-on: https://gerrit.libreoffice.org/14667

diff --git a/sc/source/filter/xml/editattributemap.cxx 
b/sc/source/filter/xml/editattributemap.cxx
index e5feb6b..fd5de8c 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 },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits