connectivity/source/commontools/formattedcolumnvalue.cxx | 2 +-
cui/source/options/optgdlg.cxx | 2 +-
cui/source/options/optlingu.cxx | 2 +-
cui/source/tabpages/numpages.cxx | 2 +-
editeng/source/misc/svxacorr.cxx | 2 +-
sc/source/core/tool/interpr1.cxx | 2 +-
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 2 +-
svtools/source/control/ctrltool.cxx | 2 +-
svx/source/dialog/svxbmpnumvalueset.cxx | 2 +-
svx/source/sidebar/line/LineWidthValueSet.cxx | 2 +-
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 2 +-
unotools/source/config/syslocaleoptions.cxx | 4 ++--
vcl/unx/gtk3/gtkframe.cxx | 2 +-
xmloff/source/style/xmlnumfe.cxx | 4 ++--
14 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit b582a76d7cc20adb8440830ffd1597258d2d6a4a
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Mon Oct 18 22:23:12 2021 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Tue Oct 19 00:20:49 2021 +0200
Use MsLangId::getConfiguredSystemUILanguage()
Change-Id: Ia9344c44a71be656a731ab8735dd8e959e520592
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123789
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/svtools/source/control/ctrltool.cxx
b/svtools/source/control/ctrltool.cxx
index 96b81ed13abb..3d908b342ab8 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -772,7 +772,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage )
if ( eLanguage == LANGUAGE_DONTKNOW )
eLanguage =
Application::GetSettings().GetUILanguageTag().getLanguageType();
if ( eLanguage == LANGUAGE_SYSTEM )
- eLanguage = MsLangId::getSystemUILanguage();
+ eLanguage = MsLangId::getConfiguredSystemUILanguage();
if (MsLangId::isSimplifiedChinese(eLanguage))
{
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index 04a31826de82..7e38237ec3b2 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -275,7 +275,7 @@ void SvtSysLocaleOptions_Impl::MakeRealUILocale()
{
if (m_aUILocaleString.isEmpty())
{
- LanguageType nLang = MsLangId::getSystemUILanguage();
+ LanguageType nLang = MsLangId::getConfiguredSystemUILanguage();
m_aRealUILocale.reset( nLang).makeFallback();
}
else
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index aa1d5b600187..41e621db24db 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -1371,7 +1371,7 @@ void GtkSalFrame::Init( SalFrame* pParent,
SalFrameStyleFlags nStyle )
//header bar with the desired 'outside' direction
if ((eType == GDK_WINDOW_TYPE_HINT_NORMAL || eType ==
GDK_WINDOW_TYPE_HINT_DIALOG) &&
DLSYM_GDK_IS_WAYLAND_DISPLAY(GtkSalFrame::getGdkDisplay()))
{
- const bool bDesktopIsRTL =
MsLangId::isRightToLeft(MsLangId::getSystemUILanguage());
+ const bool bDesktopIsRTL =
MsLangId::isRightToLeft(MsLangId::getConfiguredSystemUILanguage());
const bool bAppIsRTL = gtk_widget_get_default_direction() ==
GTK_TEXT_DIR_RTL;
if (bDesktopIsRTL != bAppIsRTL)
{
commit e3c3c3b84ef6b91f89a5e388e6538f18a2e8b13e
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Mon Oct 18 23:22:33 2021 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Tue Oct 19 00:20:36 2021 +0200
Use MsLangId::getConfiguredSystemLanguage()
Change-Id: I298f762ac7f3298aa9cb9621ad1f8cae50527b24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123790
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx
b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 072802e9a9eb..e290875236b1 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -155,7 +155,7 @@ namespace dbtools
if ( !bHaveFieldFormat )
{
// fall back to a format key as indicated by the field type
- Locale aSystemLocale( LanguageTag(
MsLangId::getSystemLanguage() ).getLocale() );
+ Locale aSystemLocale( LanguageTag(
MsLangId::getConfiguredSystemLanguage() ).getLocale() );
Reference< XNumberFormatTypes > xNumTypes(
xNumberFormatsSupp->getNumberFormats(), UNO_QUERY_THROW );
_rData.m_nFormatKey = getDefaultNumberFormat( _rxColumn,
xNumTypes, aSystemLocale );
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 5424c03622f4..30b98e8de55f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1681,7 +1681,7 @@ IMPL_LINK_NOARG(OfaLanguagesTabPage, LocaleSettingHdl,
weld::ComboBox&, void)
}
const NfCurrencyEntry& rCurr = SvNumberFormatter::GetCurrencyEntry(
- (eLang == LANGUAGE_USER_SYSTEM_CONFIG) ?
MsLangId::getSystemLanguage() : eLang);
+ (eLang == LANGUAGE_USER_SYSTEM_CONFIG) ?
MsLangId::getConfiguredSystemLanguage() : eLang);
const OUString aDefaultID = "default";
// Update the "Default ..." currency.
m_xCurrencyLB->remove_id(aDefaultID);
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 3460582c2116..3e0acc1c05d7 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1586,7 +1586,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(weld::Window*
pParent, SvxLinguData_Impl& r
LanguageType nLang = LanguageTag::convertToLanguageType( locale );
m_xLanguageLB->InsertLanguage(nLang);
}
- LanguageType eSysLang = MsLangId::getSystemLanguage();
+ LanguageType eSysLang = MsLangId::getConfiguredSystemLanguage();
m_xLanguageLB->set_active_id( eSysLang );
if (m_xLanguageLB->get_active_id() != eSysLang)
m_xLanguageLB->set_active(0);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 53711e06f266..d4a482f0e007 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2218,7 +2218,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext&
rRenderContext, const ::tool
// the whole height mustn't be used for a single level
tools::Long nYStep = (aSize.Height() - 6)/ (pActNum->GetLevelCount() >
1 ? pActNum->GetLevelCount() : 5);
- aStdFont = OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS,
MsLangId::getSystemLanguage(), GetDefaultFontFlags::OnlyOne);
+ aStdFont = OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS,
MsLangId::getConfiguredSystemLanguage(), GetDefaultFontFlags::OnlyOne);
aStdFont.SetColor(aTextColor);
aStdFont.SetFillColor(aBackColor);
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 0cd4e8d0d161..1d1735b5de28 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1926,7 +1926,7 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
const SvxAutocorrWord* pRet = nullptr;
LanguageTag aLanguageTag( rLang);
if( aLanguageTag.isSystemLocale() )
- aLanguageTag.reset( MsLangId::getSystemLanguage());
+ aLanguageTag.reset( MsLangId::getConfiguredSystemLanguage());
/* TODO-BCP47: this is so ugly, should all maybe be a proper fallback
* list instead? */
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e7030950030f..add2fea120d2 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -9017,7 +9017,7 @@ static bool IsDBCS(sal_Unicode currentChar)
{
// for the locale of ja-JP, character U+0x005c and U+0x20ac should be
ScriptType::Asian
if( (currentChar == 0x005c || currentChar == 0x20ac) &&
- (MsLangId::getSystemLanguage() == LANGUAGE_JAPANESE) )
+ (MsLangId::getConfiguredSystemLanguage() == LANGUAGE_JAPANESE) )
return true;
sal_uInt16 i;
bool bRet = false;
diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index a47c1d1f0f1d..c993f59a2a41 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
@@ -83,7 +83,7 @@ void CellLineStyleValueSet::UserDraw( const UserDrawEvent&
rUDEvt )
Color aOldColor = pDev->GetLineColor();
Color aOldFillColor = pDev->GetFillColor();
- vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS,
MsLangId::getSystemLanguage(), GetDefaultFontFlags::OnlyOne));
+ vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS,
MsLangId::getConfiguredSystemLanguage(), GetDefaultFontFlags::OnlyOne));
Size aSize = aFont.GetFontSize();
aSize.setHeight( nRectHeight*3/5 );
aFont.SetFontSize( aSize );
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx
b/svx/source/dialog/svxbmpnumvalueset.cxx
index ce39faa59734..50b9efb3cbdf 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -162,7 +162,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
Color aOldColor = pDev->GetLineColor();
pDev->SetLineColor(aTextColor);
vcl::Font aFont(OutputDevice::GetDefaultFont(
- DefaultFontType::UI_SANS, MsLangId::getSystemLanguage(),
GetDefaultFontFlags::OnlyOne));
+ DefaultFontType::UI_SANS,
MsLangId::getConfiguredSystemLanguage(), GetDefaultFontFlags::OnlyOne));
Size aSize = aFont.GetFontSize();
diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx
b/svx/source/sidebar/line/LineWidthValueSet.cxx
index f5153a6b4800..be518fe4fa74 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.cxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.cxx
@@ -90,7 +90,7 @@ void LineWidthValueSet::UserDraw( const UserDrawEvent&
rUDEvt )
Color aOldColor = pDev->GetLineColor();
Color aOldFillColor = pDev->GetFillColor();
- vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS,
MsLangId::getSystemLanguage(), GetDefaultFontFlags::OnlyOne));
+ vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS,
MsLangId::getConfiguredSystemLanguage(), GetDefaultFontFlags::OnlyOne));
Size aSize = aFont.GetFontSize();
aSize.setHeight( nRectHeight*3/5 );
aFont.SetFontSize( aSize );
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 2c6de64b458f..1b6ca2d42979 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -66,7 +66,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent&
rUDEvt )
const tools::Long nRectHeight = aRect.GetHeight();
- vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS,
MsLangId::getSystemLanguage(), GetDefaultFontFlags::OnlyOne));
+ vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::UI_SANS,
MsLangId::getConfiguredSystemLanguage(), GetDefaultFontFlags::OnlyOne));
{
Size aSize = aFont.GetFontSize();
aSize.setHeight( (nRectHeight*4)/9 );
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index 9906124a141a..04a31826de82 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -262,7 +262,7 @@ void SvtSysLocaleOptions_Impl::MakeRealLocale()
{
if (m_aLocaleString.isEmpty())
{
- LanguageType nLang = MsLangId::getSystemLanguage();
+ LanguageType nLang = MsLangId::getConfiguredSystemLanguage();
m_aRealLocale.reset( nLang).makeFallback();
}
else
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 14400f04785a..4c313538b0df 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -226,7 +226,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
}
else
{
- LanguageTag aLanguageTag( MsLangId::getSystemLanguage() );
+ LanguageTag aLanguageTag( MsLangId::getConfiguredSystemLanguage() );
pLocaleData.reset( new LocaleDataWrapper(
rExport.getComponentContext(), aLanguageTag ) );
}
@@ -256,7 +256,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
}
else
{
- LanguageTag aLanguageTag( MsLangId::getSystemLanguage() );
+ LanguageTag aLanguageTag( MsLangId::getConfiguredSystemLanguage() );
pLocaleData.reset( new LocaleDataWrapper(
rExport.getComponentContext(), aLanguageTag ) );
}
