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 /sc | |
| parent | 34f6b7f4529cc5a3b0e286fbd7318c2b7bf9b132 (diff) | |
weld SvxCharNamePage
Change-Id: Ia54a5ac4fe4a11b7c03508c336193bb52c616e7f
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/uitest/calc_tests/formatCells.py | 14 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sc/qa/uitest/calc_tests/formatCells.py b/sc/qa/uitest/calc_tests/formatCells.py index ea5e9eecd90b..a69028614b58 100644 --- a/sc/qa/uitest/calc_tests/formatCells.py +++ b/sc/qa/uitest/calc_tests/formatCells.py @@ -135,12 +135,12 @@ class formatCell(UITestCase): xLangFontEast = xDialog.getChild("eastlanglb") xLangFontCTL = xDialog.getChild("ctllanglb") - self.assertEqual(get_state_as_dict(xSizeFont)["Text"], "18") - self.assertEqual(get_state_as_dict(xSizeFontEast)["Text"], "18") - self.assertEqual(get_state_as_dict(xSizeFontCTL)["Text"], "18") #check font size - self.assertEqual(get_state_as_dict(xLangFont)["Text"], "\u202a[None]\u202c") - self.assertEqual(get_state_as_dict(xLangFontEast)["SelectEntryText"], "\u202a[None]\u202c") - self.assertEqual(get_state_as_dict(xLangFontCTL)["SelectEntryText"], "\u202a[None]\u202c") + self.assertEqual(get_state_as_dict(xSizeFont)["Text"], "18 pt") + self.assertEqual(get_state_as_dict(xSizeFontEast)["Text"], "18 pt") + self.assertEqual(get_state_as_dict(xSizeFontCTL)["Text"], "18 pt") #check font size + self.assertEqual(get_state_as_dict(xLangFont)["Text"], "[None]") + self.assertEqual(get_state_as_dict(xLangFontEast)["SelectEntryText"], "[None]") + self.assertEqual(get_state_as_dict(xLangFontCTL)["SelectEntryText"], "[None]") xCanc = xDialog.getChild("cancel") self.ui_test.close_dialog_through_button(xCanc) @@ -417,4 +417,4 @@ class formatCell(UITestCase): self.ui_test.close_dialog_through_button(xOKBtn) self.ui_test.close_doc() -# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file +# vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index c97a0bed3e74..c9b488fa2bcb 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -623,7 +623,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ ) LanguageType eLang = LanguageTag::convertToLanguageType( aSortData.aCollatorLocale, false); if ( eLang == LANGUAGE_DONTKNOW ) eLang = LANGUAGE_SYSTEM; - m_xLbLanguage->SelectLanguage( eLang ); + m_xLbLanguage->set_active_id(eLang); FillAlgor(); // get algorithms, select default if ( !aSortData.aCollatorAlgorithm.isEmpty() ) m_xLbAlgorithm->set_active_text(m_xColRes->GetTranslation(aSortData.aCollatorAlgorithm)); @@ -685,7 +685,7 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet* rArgSet ) : 0; // get locale - LanguageType eLang = m_xLbLanguage->GetSelectedLanguage(); + LanguageType eLang = m_xLbLanguage->get_active_id(); aNewSortData.aCollatorLocale = LanguageTag::convertToLocale( eLang, false); // get algorithm @@ -877,7 +877,7 @@ void ScTabPageSortOptions::FillAlgor() m_xLbAlgorithm->freeze(); m_xLbAlgorithm->clear(); - LanguageType eLang = m_xLbLanguage->GetSelectedLanguage(); + LanguageType eLang = m_xLbLanguage->get_active_id(); if ( eLang == LANGUAGE_SYSTEM ) { // for LANGUAGE_SYSTEM no algorithm can be selected because |