[Libreoffice-commits] core.git: basctl/source cui/source include/svx sc/source sd/source svx/source sw/source
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Fri Mar 23 07:25:18 UTC 2018
basctl/source/dlged/managelang.cxx | 2 +-
cui/source/dialogs/SpellDialog.cxx | 8 ++++----
cui/source/options/optasian.cxx | 6 +++---
cui/source/options/optdict.cxx | 4 ++--
cui/source/options/optgdlg.cxx | 14 +++++++-------
cui/source/options/optlingu.cxx | 2 +-
cui/source/tabpages/chardlg.cxx | 2 +-
cui/source/tabpages/numfmt.cxx | 2 +-
include/svx/langbox.hxx | 4 ++--
sc/source/ui/dbgui/scuiasciiopt.cxx | 4 ++--
sc/source/ui/dbgui/textimportoptions.cxx | 2 +-
sc/source/ui/dbgui/tpsort.cxx | 4 ++--
sd/source/ui/dlg/dlgfield.cxx | 4 ++--
sd/source/ui/dlg/headerfooterdlg.cxx | 4 ++--
svx/source/dialog/langbox.cxx | 4 ++--
sw/source/ui/dialog/ascfldlg.cxx | 4 ++--
sw/source/ui/index/cnttab.cxx | 4 ++--
sw/source/ui/misc/srtdlg.cxx | 4 ++--
18 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit c12fc293650a860d5e05c32000f904afaf0958b6
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Thu Mar 22 17:26:01 2018 +0100
Typo: GetSelectLanguage -> GetSelectedLanguage
Change-Id: Ia283812d4e9df87d875559af5366c2e36b19eab2
Reviewed-on: https://gerrit.libreoffice.org/51747
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index dd6899492c81..757b98af872e 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -302,7 +302,7 @@ Sequence< Locale > SetDefaultLanguageDialog::GetLocales() const
Sequence< Locale > aLocaleSeq( nSize );
if ( bNotLocalized )
{
- aLocaleSeq[0] = LanguageTag( m_pLanguageLB->GetSelectLanguage() ).getLocale();
+ aLocaleSeq[0] = LanguageTag( m_pLanguageLB->GetSelectedLanguage() ).getLocale();
}
else
{
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 3943b3b474cc..1b9d9957e641 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -736,7 +736,7 @@ bool SpellDialog::Close()
LanguageType SpellDialog::GetSelectedLang_Impl() const
{
- LanguageType nLang = m_pLanguageLB->GetSelectLanguage();
+ LanguageType nLang = m_pLanguageLB->GetSelectedLanguage();
return nLang;
}
@@ -753,7 +753,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, ListBox&, rBox, void)
m_pSuggestionLB->Clear();
if(!sError.isEmpty())
{
- LanguageType eLanguage = static_cast<SvxLanguageBox*>(&rBox)->GetSelectLanguage();
+ LanguageType eLanguage = static_cast<SvxLanguageBox*>(&rBox)->GetSelectedLanguage();
Reference <XSpellAlternatives> xAlt = xSpell->spell( sError, static_cast<sal_uInt16>(eLanguage),
Sequence< PropertyValue >() );
if( xAlt.is() )
@@ -779,7 +779,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
int SpellDialog::InitUserDicts()
{
- const LanguageType nLang = m_pLanguageLB->GetSelectLanguage();
+ const LanguageType nLang = m_pLanguageLB->GetSelectedLanguage();
const Reference< XDictionary > *pDic = nullptr;
@@ -1601,7 +1601,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, const css
pTextEngine->FindAttrib( TextPaM(0, nOldErrorStart), TEXTATTR_SPELL_ERROR ));
pAction->SetErrorLanguageSelected(pOldAttrib && pOldAttrib->GetErrorDescription().aSuggestions.getLength() &&
LanguageTag( pOldAttrib->GetErrorDescription().aLocale).getLanguageType() ==
- GetSpellDialog()->m_pLanguageLB->GetSelectLanguage());
+ GetSpellDialog()->m_pLanguageLB->GetSelectedLanguage());
AddUndoAction(pAction);
}
else
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index a6b6297aa4e7..fa726c30562c 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -215,7 +215,7 @@ bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
OSL_FAIL("exception in XForbiddenCharacters");
}
}
- eLastUsedLanguageTypeForForbiddenCharacters = m_pLanguageLB->GetSelectLanguage();
+ eLastUsedLanguageTypeForForbiddenCharacters = m_pLanguageLB->GetSelectedLanguage();
return false;
}
@@ -303,7 +303,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet* )
IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl, ListBox&, void)
{
//set current value
- LanguageType eSelectLanguage = m_pLanguageLB->GetSelectLanguage();
+ LanguageType eSelectLanguage = m_pLanguageLB->GetSelectedLanguage();
LanguageTag aLanguageTag( eSelectLanguage);
Locale aLocale( aLanguageTag.getLocale());
@@ -376,7 +376,7 @@ IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void)
IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit&, rEdit, void)
{
- LanguageType eSelectLanguage = m_pLanguageLB->GetSelectLanguage();
+ LanguageType eSelectLanguage = m_pLanguageLB->GetSelectedLanguage();
Locale aLocale( LanguageTag::convertToLocale( eSelectLanguage ));
OUString sStart = m_pStartED->GetText();
OUString sEnd = m_pEndED->GetText();
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 30eb207acbc2..425583b4d2c1 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -160,7 +160,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
}
// create and add
- LanguageType nLang = pLanguageLB->GetSelectLanguage();
+ LanguageType nLang = pLanguageLB->GetSelectedLanguage();
try
{
// create new dictionary
@@ -447,7 +447,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void)
IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void)
{
sal_Int32 nDicPos = pAllDictsLB->GetSelectedEntryPos();
- LanguageType nLang = pLangLB->GetSelectLanguage();
+ LanguageType nLang = pLangLB->GetSelectedLanguage();
Reference< XDictionary > xDic( aDics.getConstArray()[ nDicPos ], UNO_QUERY );
LanguageType nOldLang = LanguageTag( xDic->getLocale() ).getLanguageType();
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 8aa4c78a12d9..b6b6d2371096 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1348,7 +1348,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
)
{
//sequence checking has to be switched on depending on the selected CTL language
- LanguageType eCTLLang = m_pComplexLanguageLB->GetSelectLanguage();
+ LanguageType eCTLLang = m_pComplexLanguageLB->GetSelectedLanguage();
bool bOn = MsLangId::needsSequenceChecking( eCTLLang);
pLangConfig->aLanguageOptions.SetCTLSequenceCheckingRestricted(bOn);
pLangConfig->aLanguageOptions.SetCTLSequenceChecking(bOn);
@@ -1365,7 +1365,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
/*
if( m_pUserInterfaceLB->GetSelectedEntryPos() > 0)
- aLangString = ConvertLanguageToIsoString(m_pUserInterfaceLB->GetSelectLanguage());
+ aLangString = ConvertLanguageToIsoString(m_pUserInterfaceLB->GetSelectedLanguage());
*/
Reference< XMultiServiceFactory > theConfigProvider(
css::configuration::theDefaultProvider::get(
@@ -1403,7 +1403,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
LanguageTag aLanguageTag( pLangConfig->aSysLocaleOptions.GetLanguageTag());
LanguageType eOldLocale = (aLanguageTag.isSystemLocale() ? LANGUAGE_SYSTEM :
aLanguageTag.makeFallback().getLanguageType());
- LanguageType eNewLocale = m_pLocaleSettingLB->GetSelectLanguage();
+ LanguageType eNewLocale = m_pLocaleSettingLB->GetSelectedLanguage();
// If the "Default ..." entry was selected that means SYSTEM, the actual
// eNewLocale value is temporary for the dialog only, do not resolve to
@@ -1461,7 +1461,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
bool bValChanged = m_pWesternLanguageLB->IsValueChangedFromSaved();
if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged)
{
- LanguageType eSelectLang = m_pWesternLanguageLB->GetSelectLanguage();
+ LanguageType eSelectLang = m_pWesternLanguageLB->GetSelectedLanguage();
if(!bCurrentDocCBChecked)
{
Any aValue;
@@ -1480,7 +1480,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
bValChanged = m_pAsianLanguageLB->IsValueChangedFromSaved();
if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged)
{
- LanguageType eSelectLang = m_pAsianLanguageLB->GetSelectLanguage();
+ LanguageType eSelectLang = m_pAsianLanguageLB->GetSelectedLanguage();
if(!bCurrentDocCBChecked)
{
Any aValue;
@@ -1499,7 +1499,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
bValChanged = m_pComplexLanguageLB->IsValueChangedFromSaved();
if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged)
{
- LanguageType eSelectLang = m_pComplexLanguageLB->GetSelectLanguage();
+ LanguageType eSelectLang = m_pComplexLanguageLB->GetSelectedLanguage();
if(!bCurrentDocCBChecked)
{
Any aValue;
@@ -1756,7 +1756,7 @@ namespace
IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void )
{
SvxLanguageBox* pBox = static_cast<SvxLanguageBox*>(&rListBox);
- LanguageType eLang = pBox->GetSelectLanguage();
+ LanguageType eLang = pBox->GetSelectedLanguage();
SvtScriptType nType = SvtLanguageOptions::GetScriptTypeOfLanguage(eLang);
// first check if CTL must be enabled
// #103299# - if CTL font setting is not readonly
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 7c7d1f501ba4..1b4e70de8f7a 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1891,7 +1891,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectListBoxHdl_Impl, ListBox&, rBox, void )
void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox const * pBox)
{
- LanguageType eCurLanguage = m_pLanguageLB->GetSelectLanguage();
+ LanguageType eCurLanguage = m_pLanguageLB->GetSelectedLanguage();
static Locale aLastLocale;
Locale aCurLocale( LanguageTag::convertToLocale( eCurLanguage));
SvTreeList *pModel = m_pModulesCLB->GetModel();
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index ccde96ffc44f..7d59c2a68721 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -506,7 +506,7 @@ namespace
aSize.setHeight( 200 ); // default 10pt
aFontMetrics.SetFontSize( aSize );
- _rFont.SetLanguage(_pLanguageLB->GetSelectLanguage());
+ _rFont.SetLanguage(_pLanguageLB->GetSelectedLanguage());
_rFont.SetFamily( aFontMetrics.GetFamilyType() );
_rFont.SetFamilyName( aFontMetrics.GetFamilyName() );
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index ea4f176b4c05..7735ee8ac036 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1066,7 +1066,7 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
pNumFmtShell->CategoryChanged( nTmpCatPos,nFmtLbSelPos, aEntryList );
}
else
- pNumFmtShell->LanguageChanged( m_pLbLanguage->GetSelectLanguage(),
+ pNumFmtShell->LanguageChanged( m_pLbLanguage->GetSelectedLanguage(),
nFmtLbSelPos,aEntryList );
REMOVE_DONTKNOW() // possibly UI-Enable
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 37a9e0061fb2..a80589cdae15 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -79,7 +79,7 @@ public:
bool bCheckEntry );
void RemoveLanguage( const LanguageType eLangType );
void SelectLanguage( const LanguageType eLangType );
- LanguageType GetSelectLanguage() const;
+ LanguageType GetSelectedLanguage() const;
bool IsLanguageSelected( const LanguageType eLangType ) const;
void SetNoSelectionLBB();
@@ -168,7 +168,7 @@ public:
bool bCheckSpellAvail = false );
void AddLanguages( const std::vector< LanguageType >& rLanguageTypes, SvxLanguageListFlags nLangList );
void SelectLanguage( const LanguageType eLangType );
- LanguageType GetSelectLanguage() const;
+ LanguageType GetSelectedLanguage() const;
void connect_changed(const Link<weld::ComboBoxText&, void>& rLink) { m_aChangeHdl = rLink; }
};
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 99c084b7edea..381bc7e9cacb 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -627,7 +627,7 @@ void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt )
{
rOpt.SetCharSet( meCharSet );
rOpt.SetCharSetSystem( mbCharSetSystem );
- rOpt.SetLanguage(pLbCustomLang->GetSelectLanguage());
+ rOpt.SetLanguage(pLbCustomLang->GetSelectedLanguage());
rOpt.SetFixedLen( pRbFixed->IsChecked() );
rOpt.SetStartRow( static_cast<long>(pNfRow->GetValue()) );
mpTableBox->FillColumnData( rOpt );
@@ -651,7 +651,7 @@ void ScImportAsciiDlg::SaveParameters()
pRbFixed->IsChecked(),
static_cast<sal_Int32>(pNfRow->GetValue()),
pLbCharSet->GetSelectedEntryPos(),
- static_cast<sal_uInt16>(pLbCustomLang->GetSelectLanguage()),
+ static_cast<sal_uInt16>(pLbCustomLang->GetSelectedLanguage()),
pCkbSkipEmptyCells->IsChecked(), pCkbRemoveSpace->IsChecked(), meCall );
}
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index 8f459bbc89ef..8d81f967f972 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -56,7 +56,7 @@ LanguageType ScTextImportOptionsDlg::getLanguageType() const
if (m_pRbAutomatic->IsChecked())
return LANGUAGE_SYSTEM;
- return m_pLbCustomLang->GetSelectLanguage();
+ return m_pLbCustomLang->GetSelectedLanguage();
}
bool ScTextImportOptionsDlg::isDateConversionSet() const
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index ee008bd01089..906dd77837c1 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -740,7 +740,7 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet* rArgSet )
: 0;
// get locale
- LanguageType eLang = m_pLbLanguage->GetSelectLanguage();
+ LanguageType eLang = m_pLbLanguage->GetSelectedLanguage();
aNewSortData.aCollatorLocale = LanguageTag::convertToLocale( eLang, false);
// get algorithm
@@ -940,7 +940,7 @@ IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl, ListBox&, void)
m_pLbAlgorithm->SetUpdateMode( false );
m_pLbAlgorithm->Clear();
- LanguageType eLang = m_pLbLanguage->GetSelectLanguage();
+ LanguageType eLang = m_pLbLanguage->GetSelectedLanguage();
if ( eLang == LANGUAGE_SYSTEM )
{
// for LANGUAGE_SYSTEM no algorithm can be selected because
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index dcb9799c3283..b20291547764 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -168,7 +168,7 @@ SvxFieldData* SdModifyFieldDlg::GetField()
void SdModifyFieldDlg::FillFormatList()
{
- LanguageType eLangType = m_pLbLanguage->GetSelectLanguage();
+ LanguageType eLangType = m_pLbLanguage->GetSelectedLanguage();
m_pLbFormat->Clear();
@@ -323,7 +323,7 @@ SfxItemSet SdModifyFieldDlg::GetItemSet()
if( m_pLbLanguage->IsValueChangedFromSaved() )
{
- LanguageType eLangType = m_pLbLanguage->GetSelectLanguage();
+ LanguageType eLangType = m_pLbLanguage->GetSelectedLanguage();
SvxLanguageItem aItem( eLangType, EE_CHAR_LANGUAGE );
aOutput.Put( aItem );
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index da9f2f6679d1..22d48d765435 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -479,7 +479,7 @@ IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl, ListBox&, void)
void HeaderFooterTabPage::FillFormatList( sal_Int32 nSelectedPos )
{
- LanguageType eLanguage = mpCBDateTimeLanguage->GetSelectLanguage();
+ LanguageType eLanguage = mpCBDateTimeLanguage->GetSelectedLanguage();
mpCBDateTimeFormat->Clear();
@@ -551,7 +551,7 @@ void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOn
rSettings.meTimeFormat = nDateTimeFormats[nPos].meTimeFormat;
}
- LanguageType eLanguage = mpCBDateTimeLanguage->GetSelectLanguage();
+ LanguageType eLanguage = mpCBDateTimeLanguage->GetSelectedLanguage();
if( eLanguage != meOldLanguage )
GetOrSetDateTimeLanguage( eLanguage, true );
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index d99b65bd63ec..b64e6a9a1b7b 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -445,7 +445,7 @@ void SvxLanguageBoxBase::RemoveLanguage( const LanguageType eLangType )
}
-LanguageType SvxLanguageBoxBase::GetSelectLanguage() const
+LanguageType SvxLanguageBoxBase::GetSelectedLanguage() const
{
sal_Int32 nPos = ImplGetSelectEntryPos();
@@ -527,7 +527,7 @@ sal_Int32 SvxLanguageBoxBase::GetSavedValueLBB() const
return ImplGetSavedValue();
}
-LanguageType LanguageBox::GetSelectLanguage() const
+LanguageType LanguageBox::GetSelectedLanguage() const
{
OUString sLang = m_xControl->get_active_id();
if (!sLang.isEmpty())
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 8da402716929..b3cd4f6768c2 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -270,7 +270,7 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions )
if( m_pFontLB->IsVisible() )
{
sFont = m_pFontLB->GetSelectedEntry();
- nLng = m_pLanguageLB->GetSelectLanguage();
+ nLng = m_pLanguageLB->GetSelectedLanguage();
}
rOptions.SetFontName( sFont );
@@ -326,7 +326,7 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, ListBox&, rListBox, void )
SvxTextEncodingBox* pBox = static_cast<SvxTextEncodingBox*>(&rListBox);
LineEnd eOldEnd = GetCRLF(), eEnd = LineEnd(-1);
LanguageType nLng = m_pFontLB->IsVisible()
- ? m_pLanguageLB->GetSelectLanguage()
+ ? m_pLanguageLB->GetSelectedLanguage()
: LANGUAGE_SYSTEM,
nOldLng = nLng;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index e9a040450012..e3fd606cc073 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1242,7 +1242,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
rDesc.SetStyleNames(aStyleArr[i], i);
- rDesc.SetLanguage(m_pLanguageLB->GetSelectLanguage());
+ rDesc.SetLanguage(m_pLanguageLB->GetSelectedLanguage());
const OUString* pEntryData = static_cast<const OUString*>(m_pSortAlgorithmLB->GetSelectedEntryData());
OSL_ENSURE(pEntryData, "no entry data available");
if(pEntryData)
@@ -1432,7 +1432,7 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageListBoxHdl, ListBox&, rBox, void)
}
void SwTOXSelectTabPage::LanguageHdl( ListBox const * pBox )
{
- lang::Locale aLcl( LanguageTag( m_pLanguageLB->GetSelectLanguage() ).getLocale() );
+ lang::Locale aLcl( LanguageTag( m_pLanguageLB->GetSelectedLanguage() ).getLocale() );
Sequence< OUString > aSeq = pIndexEntryWrapper->GetAlgorithmList( aLcl );
if( !pIndexRes )
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index cc5fe336e436..3d0d33f8b4f3 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -255,7 +255,7 @@ void SwSortDlg::Apply()
bAsc2 = m_xSortUp2RB->get_active();
bAsc3 = m_xSortUp3RB->get_active();
bCol = m_xColumnRB->get_active();
- nLang = m_xLangLB->GetSelectLanguage();
+ nLang = m_xLangLB->GetSelectedLanguage();
cDeli = GetDelimChar();
bCsSens = m_xCaseCB->get_active();
@@ -389,7 +389,7 @@ IMPL_LINK( SwSortDlg, LanguageListBoxHdl, weld::ComboBoxText&, rLBox, void )
void SwSortDlg::LanguageHdl(weld::ComboBoxText const* pLBox)
{
Sequence < OUString > aSeq( GetAppCollator().listCollatorAlgorithms(
- LanguageTag( m_xLangLB->GetSelectLanguage()).getLocale() ));
+ LanguageTag( m_xLangLB->GetSelectedLanguage()).getLocale() ));
if (!m_xColRes)
m_xColRes.reset(new CollatorResource);
More information about the Libreoffice-commits
mailing list