diff options
Diffstat (limited to 'svtools/source/control')
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 10 | ||||
-rw-r--r-- | svtools/source/control/ctrltool.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/stdmenu.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index cebc2feaca6b..4a2c156e2d91 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1460,7 +1460,7 @@ void FontStyleBox::LoseFocus() void FontStyleBox::Modify() { CharClass aChrCls( ::comphelper::getProcessComponentContext(), - GetSettings().GetLocale() ); + GetSettings().GetLanguageTag().getLocale() ); XubString aStr = GetText(); sal_uInt16 nEntryCount = GetEntryCount(); @@ -1682,7 +1682,7 @@ void FontSizeBox::ImplInit() void FontSizeBox::Reformat() { - FontSizeNames aFontSizeNames( GetSettings().GetUILanguage() ); + FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() ); if ( !bRelativeMode || !aFontSizeNames.IsEmpty() ) { long nNewValue = aFontSizeNames.Name2Size( GetText() ); @@ -1776,7 +1776,7 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList ) } // first insert font size names (for simplified/traditional chinese) - FontSizeNames aFontSizeNames( GetSettings().GetUILanguage() ); + FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() ); if ( pAry == pList->GetStdSizeAry() ) { // for standard sizes we don't need to bother @@ -1943,7 +1943,7 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ) if ( !bRelative ) { sal_Int64 nTempValue = MetricField::ConvertValue( nNewValue, GetBaseValue(), GetDecimalDigits(), eInUnit, GetUnit() ); - FontSizeNames aFontSizeNames( GetSettings().GetUILanguage() ); + FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() ); // conversion loses precision; however font sizes should // never have a problem with that String aName = aFontSizeNames.Size2Name( static_cast<long>(nTempValue) ); @@ -1971,7 +1971,7 @@ sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const { if ( !bRelative ) { - FontSizeNames aFontSizeNames( GetSettings().GetUILanguage() ); + FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() ); sal_Int64 nValue = aFontSizeNames.Name2Size( GetText() ); if ( nValue) return MetricField::ConvertValue( nValue, GetBaseValue(), GetDecimalDigits(), GetUnit(), eOutUnit ); diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 918920c066cf..5861b23d05da 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -779,7 +779,7 @@ static const ImplFSNameItem aImplSimplifiedChinese[] = FontSizeNames::FontSizeNames( LanguageType eLanguage ) { if ( eLanguage == LANGUAGE_DONTKNOW ) - eLanguage = Application::GetSettings().GetUILanguage(); + eLanguage = Application::GetSettings().GetUILanguageTag().getLanguageType(); if ( eLanguage == LANGUAGE_SYSTEM ) eLanguage = MsLangId::getSystemUILanguage(); diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index 71a98a403eee..ab684460f512 100644 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -176,7 +176,7 @@ void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList ) sal_uInt16 nPos = 0; // first insert font size names (for simplified/traditional chinese) - FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguage() ); + FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguageTag().getLanguageType() ); mpHeightAry = new long[nSizeCount+aFontSizeNames.Count()]; if ( !aFontSizeNames.IsEmpty() ) { |