[libreoffice/f20] Resolves: tdf#89679 fix incorrect mapping of font-family-complex and CharFontNameAsian

[Eike Rathke]

commit 9658f0eb564373470b1eacdfc40a6d1390589562
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Feb 27 16:00:30 2015 +0100

    Resolves: tdf#89679 fix incorrect mapping of font-family-complex and CharFontNameAsian

 ...ix-incorrect-mapping-of-font-family-compl.patch | 49 ++++++++++++++++++++++
 libreoffice.spec                                   |  6 ++-
 2 files changed, 54 insertions(+), 1 deletion(-)
---
diff --git a/0001-tdf-89679-fix-incorrect-mapping-of-font-family-compl.patch b/0001-tdf-89679-fix-incorrect-mapping-of-font-family-compl.patch
new file mode 100644
index 0000000..41d5f5b
--- /dev/null
+++ b/0001-tdf-89679-fix-incorrect-mapping-of-font-family-compl.patch
@@ -0,0 +1,49 @@
+From a693d9e1aa7a91eeecbd612c012850161a2a0767 Mon Sep 17 00:00:00 2001
+Message-Id: <a693d9e1aa7a91eeecbd612c012850161a2a0767.1425047991.git.erack at redhat.com>
+From: Mark Hung <marklh9 at gmail.com>
+Date: Thu, 26 Feb 2015 16:55:46 -0800
+Subject: [PATCH] tdf#89679 - fix incorrect mapping of font-family-complex and
+ CharFontNameAsian
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
+
+This is a multi-part message in MIME format.
+--------------erAck-patch-parts
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+
+Change-Id: I4adad1675f2a880e14ed870a3c74e43e8898c371
+Reviewed-on: https://gerrit.libreoffice.org/14663
+Tested-by: Jenkins <ci at libreoffice.org>
+Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
+Reviewed-by: Eike Rathke <erack at redhat.com>
+Tested-by: Eike Rathke <erack at redhat.com>
+(cherry picked from commit cda9ae79e58d861a85128d6a37587b633b956aae)
+---
+ sc/source/filter/xml/editattributemap.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+
+--------------erAck-patch-parts
+Content-Type: text/x-patch; name="0001-tdf-89679-fix-incorrect-mapping-of-font-family-compl.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-tdf-89679-fix-incorrect-mapping-of-font-family-compl.patch"
+
+diff --git a/sc/source/filter/xml/editattributemap.cxx b/sc/source/filter/xml/editattributemap.cxx
+index decea89..15510a2 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 },
+
+--------------erAck-patch-parts--
+
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 78b29a8..ec5d949 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -36,7 +36,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        6%{?libo_prerelease}%{?dist}
+Release:        7%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -351,6 +351,7 @@ Patch95: 0001-fdo-87199-sw-fix-root-cause-of-a11y-crash-when-mergi.patch
 Patch96: 0001-Resolves-tdf-89500-catch-ISO-8601-datetime-in-all-lo.patch
 Patch97: 0001-Resolves-tdf-89484-check-that-sheet-reference-is-wit.patch
 Patch98: 0001-Resolves-tdf-81659-handle-expand-reference-edge-corr.patch
+Patch99: 0001-tdf-89679-fix-incorrect-mapping-of-font-family-compl.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2288,6 +2289,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Feb 27 2015 Eike Rathke <erack at redhat.com> - 1:4.2.8.2-7-UNBUILT
+- Resolves: tdf#89679 fix incorrect mapping of font-family-complex and CharFontNameAsian
+
 * Thu Feb 26 2015 Eike Rathke <erack at redhat.com> - 1:4.2.8.2-6
 - Resolves: tdf#83461 do not override MatColsRows if already set
 - Resolves: rhbz#1190657 tdf#87199 Writer crashes when merging table cells