summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomofumi Yagi <yagit@mknada.sakura.ne.jp>2015-01-29 20:12:47 +0900
committerAndras Timar <andras.timar@collabora.com>2015-01-31 09:49:50 +0000
commit6e4e936d9bffbe7f890809b722a74cd7f95106a8 (patch)
tree8981e76535c6fa4467b639aef3088f9bb5a04522
parentfaf1498e0e2d1ab60eb7d88bced8cebe49584d28 (diff)
fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.
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 <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250) Reviewed-on: https://gerrit.libreoffice.org/14262 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--unotools/source/misc/fontdefs.cxx4
1 files 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 },