diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 19:07:05 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 19:07:05 +0200 |
| commit | c87019c1a938d7bb4ba1575f79df20f94a619ca9 (patch) | |
| tree | 76f3d71ea01469e16f365f145cdeb464983aebd9 /unotools | |
| parent | 149bb82c280a7846981793714d9111a83119798d (diff) | |
| parent | ef29f115c0e99c631ec7e037f4b39e961dc3c858 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
svtools/source/control/toolbarmenu.cxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/settings.hxx
vcl/unx/inc/saldata.hxx
vcl/unx/kde4/KDESalGraphics.cxx
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 2 | ||||
| -rw-r--r-- | unotools/source/misc/fontdefs.cxx | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 9fc53924e97b..97c1776bf95b 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -379,7 +379,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(RTL_CONSTASCII_USTRINGPARAM("BrOffice")); else diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index ba90cde2cced..c89427dd27a2 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 }, |