diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-10 17:19:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-14 11:43:51 +0100 |
| commit | 9237a905fa5f2b67db73c15847eff203a258c2b4 (patch) | |
| tree | bf213e7f3fd7322ee032af9fa648d04c99faaba1 /sw/source/ui | |
| parent | 34f6b7f4529cc5a3b0e286fbd7318c2b7bf9b132 (diff) | |
weld SvxCharNamePage
Change-Id: Ia54a5ac4fe4a11b7c03508c336193bb52c616e7f
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/dialog/ascfldlg.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/misc/srtdlg.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 5c780926ae43..bf7fed52c32f 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -179,7 +179,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, } m_xLanguageLB->SetLanguageList( SvxLanguageListFlags::ALL, true ); - m_xLanguageLB->SelectLanguage( aOpt.GetLanguage() ); + m_xLanguageLB->set_active_id(aOpt.GetLanguage()); } { @@ -263,7 +263,7 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) if (m_xFontLB->get_visible()) { sFont = m_xFontLB->get_active_text(); - nLng = m_xLanguageLB->GetSelectedLanguage(); + nLng = m_xLanguageLB->get_active_id(); } rOptions.SetFontName( sFont ); @@ -324,7 +324,7 @@ IMPL_LINK_NOARG( SwAsciiFilterDlg, CharSetSelHdl, weld::ComboBoxText&, void ) { LineEnd eOldEnd = GetCRLF(), eEnd = LineEnd(-1); LanguageType nLng = m_xFontLB->get_visible() - ? m_xLanguageLB->GetSelectedLanguage() + ? m_xLanguageLB->get_active_id() : LANGUAGE_SYSTEM, nOldLng = nLng; @@ -391,7 +391,7 @@ IMPL_LINK_NOARG( SwAsciiFilterDlg, CharSetSelHdl, weld::ComboBoxText&, void ) m_bSaveLineStatus = true; if (nOldLng != nLng && m_xFontLB->get_visible()) - m_xLanguageLB->SelectLanguage( nLng ); + m_xLanguageLB->set_active_id(nLng); } IMPL_LINK(SwAsciiFilterDlg, LineEndHdl, weld::ToggleButton&, rBtn, void) diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 0420bc94b7c6..7fa7e238554a 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -181,7 +181,7 @@ SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell) nLang = GetAppLanguage(); m_xLangLB->SetLanguageList( SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, true ); - m_xLangLB->SelectLanguage( nLang ); + m_xLangLB->set_active_id(nLang); LanguageHdl( nullptr ); m_xLangLB->connect_changed( LINK( this, SwSortDlg, LanguageListBoxHdl )); @@ -254,7 +254,7 @@ void SwSortDlg::Apply() bAsc2 = m_xSortUp2RB->get_active(); bAsc3 = m_xSortUp3RB->get_active(); bCol = m_xColumnRB->get_active(); - nLang = m_xLangLB->GetSelectedLanguage(); + nLang = m_xLangLB->get_active_id(); cDeli = GetDelimChar(); bCsSens = m_xCaseCB->get_active(); @@ -384,7 +384,7 @@ IMPL_LINK( SwSortDlg, LanguageListBoxHdl, weld::ComboBoxText&, rLBox, void ) void SwSortDlg::LanguageHdl(weld::ComboBoxText const* pLBox) { Sequence < OUString > aSeq( GetAppCollator().listCollatorAlgorithms( - LanguageTag( m_xLangLB->GetSelectedLanguage()).getLocale() )); + LanguageTag( m_xLangLB->get_active_id()).getLocale() )); if (!m_xColRes) m_xColRes.reset(new CollatorResource); |