summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomofumi Yagi <yagit@mknada.sakura.ne.jp>2015-01-29 20:12:47 +0900
committerMichael Stahl <mstahl@redhat.com>2015-02-05 07:26:09 +0000
commitdf967d58b8e7aa640370819c1d4c5728f937c39d (patch)
tree35a219d72838d6b976eaf83db68c4d26e2930e88
parent954840d55ede990b368c5314bdb876ced56cfbe2 (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/14317 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.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 61f6a0716bed..38cfdcf591d5 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 },