From 94caf6a8368b127e2d9e82c2bcb6c6e6958b68c2 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Thu, 10 Feb 2011 19:21:37 +0900 Subject: GetEnglishSearchFontName() searches Takao fonts Signed-off-by: Kohei Yoshida --- unotools/source/misc/fontdefs.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'unotools') diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index f03290aef4f8..ec8d947add8c 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 }, -- cgit v1.2.3 From 05cf0251b51784c5f3b44aeef27ccc07b01f1dcd Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 11 Feb 2011 22:36:09 +0100 Subject: use "BrOffice" name if the Brazilian UI translation is used (bnc#33744) it is not enough to check the system UI setting Signed off by Michael Meeks --- unotools/source/config/configmgr.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unotools') diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 956561648f99..13583c5d841b 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -403,7 +403,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) ::rtl::OUString sBrandName; #ifdef ENABLE_BROFFICE - LanguageType nType = MsLangId::getSystemUILanguage(); + LanguageType nType = MsLangId::getRealLanguage( LANGUAGE_NONE ); if ( nType == LANGUAGE_PORTUGUESE_BRAZILIAN ) sBrandName = OUString::createFromAscii("BrOffice"); else -- cgit v1.2.3