diff options
| author | Tomofumi Yagi <yagit@mknada.sakura.ne.jp> | 2015-01-29 20:12:47 +0900 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-06 14:37:35 +0000 |
| commit | 2ce0432345033701200a92f662ce6b989d1319cb (patch) | |
| tree | 26ffac65de770fe1168e0cf75d5e5f0c7573dd6b /unotools/source/misc/fontdefs.cxx | |
| parent | dccaa2b12871b801aacba3e358a8e34829218b49 (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/14256
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'unotools/source/misc/fontdefs.cxx')
| -rw-r--r-- | unotools/source/misc/fontdefs.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index 133d77ad7903..3788161d748c 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 }, |