diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-22 12:26:52 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-22 12:34:59 +0100 |
| commit | 9955dbebbdf1b7d36fec272dfea46f57fab47e19 (patch) | |
| tree | 80705ccc2382e7440ea76f62a544d64d12d1ce4f /extensions | |
| parent | 9c5d6ea5efb5f56a4ac96b4a8505ed84abbbc6bf (diff) | |
AllSettings with LanguageTag
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Library_res.mk | 1 | ||||
| -rw-r--r-- | extensions/source/propctrlr/fontdialog.cxx | 6 | ||||
| -rw-r--r-- | extensions/source/resource/oooresourceloader.cxx | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index 953e369e4d48..3297b14200dd 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_sdk_api,res)) $(eval $(call gb_Library_use_libraries,res,\ vcl \ + i18nisolang1 \ tl \ comphelper \ cppu \ diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 2df5157ed67c..1661f6e0e967 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -239,7 +239,7 @@ namespace pcr aUnderlineItem.SetColor(Color(nTextLineColor)); SvxColorItem aSvxColorItem(nColor32,CFID_CHARCOLOR); - SvxLanguageItem aLanguageItem(Application::GetSettings().GetUILanguage(), CFID_LANGUAGE); + SvxLanguageItem aLanguageItem(Application::GetSettings().GetUILanguageTag().getLanguageType(), CFID_LANGUAGE); // the 2 CJK props SvxCharReliefItem aFontReliefItem((FontRelief)nFontRelief, CFID_RELIEF); @@ -494,7 +494,7 @@ namespace pcr *pCounter++ = new SvxFontHeightItem(aDefaultVCLFont.GetHeight(), 100, CFID_HEIGHT); *pCounter++ = new SvxWeightItem(aDefaultVCLFont.GetWeight(), CFID_WEIGHT); *pCounter++ = new SvxPostureItem(aDefaultVCLFont.GetItalic(), CFID_POSTURE); - *pCounter++ = new SvxLanguageItem(Application::GetSettings().GetUILanguage(), CFID_LANGUAGE); + *pCounter++ = new SvxLanguageItem(Application::GetSettings().GetUILanguageTag().getLanguageType(), CFID_LANGUAGE); *pCounter++ = new SvxUnderlineItem(aDefaultVCLFont.GetUnderline(), CFID_UNDERLINE); *pCounter++ = new SvxCrossedOutItem(aDefaultVCLFont.GetStrikeout(), CFID_STRIKEOUT); *pCounter++ = new SvxWordLineModeItem(aDefaultVCLFont.IsWordLineMode(), CFID_WORDLINEMODE); @@ -506,7 +506,7 @@ namespace pcr *pCounter++ = new SvxFontHeightItem(aDefaultVCLFont.GetHeight(), 100, CFID_CJK_HEIGHT); *pCounter++ = new SvxWeightItem(aDefaultVCLFont.GetWeight(), CFID_CJK_WEIGHT); *pCounter++ = new SvxPostureItem(aDefaultVCLFont.GetItalic(), CFID_CJK_POSTURE); - *pCounter++ = new SvxLanguageItem(Application::GetSettings().GetUILanguage(), CFID_CJK_LANGUAGE); + *pCounter++ = new SvxLanguageItem(Application::GetSettings().GetUILanguageTag().getLanguageType(), CFID_CJK_LANGUAGE); *pCounter++ = new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, CFID_CASEMAP); *pCounter++ = new SvxContourItem(sal_False, CFID_CONTOUR); diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index a1ee7f91c69f..2c0920c954cf 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -164,7 +164,7 @@ namespace extensions { namespace resource //-------------------------------------------------------------------- Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const ::rtl::OUString& _baseName ) throw (MissingResourceException, RuntimeException) { - return loadBundle( _baseName, Application::GetSettings().GetUILocale() ); + return loadBundle( _baseName, Application::GetSettings().GetUILanguageTag().getLocale() ); } //-------------------------------------------------------------------- |