From 6e4e936d9bffbe7f890809b722a74cd7f95106a8 Mon Sep 17 00:00:00 2001 From: Tomofumi Yagi Date: Thu, 29 Jan 2015 20:12:47 +0900 Subject: fix tdf#88855: GetEnglishSearchFontName() returns incorrect value. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GetEnglishSearchFontName() returns incorrect value for specific localized font name as parameter(ex."HGS Gothic M"). Because, the conversion table "aImplLocalizedNamesList[]" is wrong. http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181 This causes the assertion from vcl/source/font/PhysicalFontFamily.cxx(line:297), and more problems, probably. This patch fixes two entries in the conversion table. One fixes the assertion, another fixes typo. Change-Id: I3141bbbb7956608cc59f20ad42c76ef97a42189d Reviewed-on: https://gerrit.libreoffice.org/14244 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250) Reviewed-on: https://gerrit.libreoffice.org/14262 Reviewed-by: Andras Timar Tested-by: Andras Timar --- unotools/source/misc/fontdefs.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index cdb8bd6568c6..a5fd5ff9c275 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -284,10 +284,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] = { "mdeasop", aMDEasop }, { "hggothice", aHGGothicE }, { "hgpgothice", aHGPGothicE }, -{ "hgpothice", aHGSGothicE }, +{ "hgsgothice", aHGSGothicE }, { "hggothicm", aHGGothicM }, { "hgpgothicm", aHGPGothicM }, -{ "hgpgothicm", aHGSGothicM }, +{ "hgsgothicm", aHGSGothicM }, { "hggyoshotai", aHGGyoshotai }, { "hgpgyoshotai", aHGPGyoshotai }, { "hgsgyoshotai", aHGSGyoshotai }, -- cgit v1.2.3