[Libreoffice-commits] .: Branch 'libreoffice-3-3-1' - unotools/source

[Thorsten Behrens]

 unotools/source/misc/fontdefs.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 98d95521d866f708178d561e2f2a1671af93b0e1
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Thu Feb 10 19:21:37 2011 +0900

    GetEnglishSearchFontName() searches Takao fonts
    
    Signed-off-by: Kohei Yoshida <kyoshida at novell.com>
    (cherry picked from commit 3b8c4baec540c851ebf97d933e11150192defa87)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>
    Signed-off-by: Thorsten Behrens <tbehrens at novell.com>
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>

diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index e216348..4e0b812 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -91,6 +91,10 @@ static sal_Unicode const aIPAPMincho[] = { 'i', 'p', 'a', 'p', 0x660E, 0x671D, 0
 static sal_Unicode const aIPAGothic[] =  { 'i', 'p', 'a',  0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
 static sal_Unicode const aIPAPGothic[] =  { 'i', 'p', 'a', 'p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
 static sal_Unicode const aIPAUIGothic[] =  { 'i', 'p', 'a', 'u', 'i', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
+static sal_Unicode const aTakaoMincho[] =  { 't', 'a', 'k', 'a', 'o', 0x660E, 0x671D, 0 };
+static sal_Unicode const aTakaoPMincho[] = { 't', 'a', 'k', 'a', 'o', 'p', 0x660E, 0x671D, 0 };
+static sal_Unicode const aTakaoGothic[] =  { 't', 'a', 'k', 'a', 'o',  0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
+static sal_Unicode const aTakaoPGothic[] =  { 't', 'a', 'k', 'a', 'o', 'p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
 static sal_Unicode const aSazanamiMincho[] = { 0x3055, 0x3056, 0x306A, 0x307F, 0x660E, 0x671D, 0, 0 };
 static sal_Unicode const aSazanamiGothic[] = { 0x3055, 0x3056, 0x306A, 0x307F, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
 static sal_Unicode const aKochiMincho[] = { 0x6771, 0x98A8, 0x660E, 0x671D, 0, 0 };
@@ -236,6 +240,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
 {   "ipagothic",            aIPAGothic },
 {   "ipapgothic",           aIPAPGothic },
 {   "ipauigothic",          aIPAUIGothic },
+{   "takaomincho",          aTakaoMincho },
+{   "takaopmincho",         aTakaoPMincho },
+{   "takaogothic",          aTakaoGothic },
+{   "takaopgothic",         aTakaoPGothic },
 {   "sazanamimincho",       aSazanamiMincho },
 {   "sazanamigothic",       aSazanamiGothic },
 {   "kochimincho",          aKochiMincho },