cui/inc/tipoftheday.hrc | 1 cui/source/options/optgdlg.cxx | 159 +++------------------------------- cui/source/options/optgdlg.hxx | 11 -- cui/uiconfig/ui/optlanguagespage.ui | 38 ++------ sc/qa/uitest/calc_tests8/tdf126248.py | 4 svl/source/config/cjkoptions.cxx | 28 ++++- svl/source/config/ctloptions.cxx | 6 - sw/qa/uitest/findReplace/tdf118208.py | 7 - 8 files changed, 61 insertions(+), 193 deletions(-)
New commits: commit 11c3d7bb03ab1daa8f14fff076987f65b7e36700 Author: Jonathan Clark <[email protected]> AuthorDate: Tue Oct 7 15:50:28 2025 -0600 Commit: Jonathan Clark <[email protected]> CommitDate: Thu Oct 9 22:54:42 2025 +0200 tdf#168719 Always show RTL/CTL and CJK editing features This change removes the user interface elements to enable or disable "Asian" and "Complex text layout" in Default Languages for Documents. Support for these language groups is now hard-coded to be enabled. Previously, certain features were hidden from users unless they manually enabled these options. Those features are now visible to all users. Change-Id: I50370cb9ed2af91c29ebb3e07a2a6470846cbd06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192108 Reviewed-by: Jonathan Clark <[email protected]> Tested-by: Jenkins diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc index d9a34a090a71..db4125104406 100644 --- a/cui/inc/tipoftheday.hrc +++ b/cui/inc/tipoftheday.hrc @@ -216,7 +216,6 @@ const std::tuple<TranslateId, OUString, OUString, tipModule> TIPOFTHEDAY_STRINGA { NC_("RID_CUI_TIPOFTHEDAY", "Rename your slides in Impress to help you define “Go to page” interactions and to have a summary more explicit than Slide1, Slide2…"), "", "", simpress}, { NC_("RID_CUI_TIPOFTHEDAY", "Want to display text before a heading number? Open the Numbering tab of the “Heading Numbering” dialog and enter the desired text in “Before”. For example, type “Chapter ” to display “Chapter 1”."), "modules/swriter/ui/outlinenumberingpage/prefix", "", swriter}, { NC_("RID_CUI_TIPOFTHEDAY", "Transpose a Writer table? Copy and paste in Calc, transpose with copy/paste special then copy/paste special ▸ Formatted text in Writer."), "", "", swriter}, - { NC_("RID_CUI_TIPOFTHEDAY", "To get the “Vertical Text” tool in the Drawing toolbar, check Tools ▸ Options ▸ Languages and Locales ▸ General ▸ Default languages for Documents ▸ Asian (and make the button visible with right-click and then Visible Buttons ▸ Vertical Text)."), "", "", soffice}, { NC_("RID_CUI_TIPOFTHEDAY", "To quickly zoom in on range selection, right click on the zoom part of the status bar and choose Optimal."), "", "", scalc}, { NC_("RID_CUI_TIPOFTHEDAY", "You can sign existing PDF files and also verify those signatures."), "https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/guide/digital_signatures.html";, "", soffice}, //local help missing { NC_("RID_CUI_TIPOFTHEDAY", "Often create one document from another? Consider using a template."), "", "", swriter}, diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 75ef55baf597..78cf7a06bb56 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -919,12 +919,12 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(weld::Container* pPage, weld::DialogCon , m_xWesternLanguageFT(m_xBuilder->weld_label(u"western"_ustr)) , m_xWesternLanguageImg(m_xBuilder->weld_widget(u"lockwesternlanguage"_ustr)) , m_xAsianLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box(u"asianlanguage"_ustr))) + , m_xAsianLanguageFT(m_xBuilder->weld_label(u"asian"_ustr)) + , m_xAsianLanguageImg(m_xBuilder->weld_widget(u"lockasianlanguage"_ustr)) , m_xComplexLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box(u"complexlanguage"_ustr))) + , m_xComplexLanguageFT(m_xBuilder->weld_label(u"complex"_ustr)) + , m_xComplexLanguageImg(m_xBuilder->weld_widget(u"lockcomplexlanguage"_ustr)) , m_xCurrentDocCB(m_xBuilder->weld_check_button(u"currentdoc"_ustr)) - , m_xAsianSupportCB(m_xBuilder->weld_check_button(u"asiansupport"_ustr)) - , m_xAsianSupportImg(m_xBuilder->weld_widget(u"lockasiansupport"_ustr)) - , m_xCTLSupportCB(m_xBuilder->weld_check_button(u"ctlsupport"_ustr)) - , m_xCTLSupportImg(m_xBuilder->weld_widget(u"lockctlsupport"_ustr)) , m_xIgnoreLanguageChangeCB(m_xBuilder->weld_check_button(u"ignorelanguagechange"_ustr)) , m_xIgnoreLanguageChangeImg(m_xBuilder->weld_widget(u"lockignorelanguagechange"_ustr)) { @@ -1056,26 +1056,6 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(weld::Container* pPage, weld::DialogCon m_xLocaleSettingLB->connect_changed( LINK( this, OfaLanguagesTabPage, LocaleSettingHdl ) ); m_xDatePatternsED->connect_changed( LINK( this, OfaLanguagesTabPage, DatePatternsHdl ) ); - Link<weld::Toggleable&,void> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) ); - m_xAsianSupportCB->connect_toggled( aLink ); - m_xCTLSupportCB->connect_toggled( aLink ); - - m_bOldAsian = SvtCJKOptions::IsAnyEnabled(); - m_xAsianSupportCB->set_active(m_bOldAsian); - m_xAsianSupportCB->save_state(); - bool bReadonly = SvtCJKOptions::IsAnyReadOnly(); - m_xAsianSupportCB->set_sensitive(!bReadonly); - m_xAsianSupportImg->set_visible(bReadonly); - SupportHdl(*m_xAsianSupportCB); - - m_bOldCtl = SvtCTLOptions::IsCTLFontEnabled(); - m_xCTLSupportCB->set_active(m_bOldCtl); - m_xCTLSupportCB->save_state(); - bReadonly = pLangConfig->aCTLLanguageOptions.IsReadOnly(SvtCTLOptions::E_CTLFONT); - m_xCTLSupportCB->set_sensitive(!bReadonly); - m_xCTLSupportImg->set_visible(bReadonly); - SupportHdl(*m_xCTLSupportCB); - m_xIgnoreLanguageChangeCB->set_active( pLangConfig->aSysLocaleOptions.IsIgnoreLanguageChange() ); } @@ -1088,24 +1068,6 @@ std::unique_ptr<SfxTabPage> OfaLanguagesTabPage::Create( weld::Container* pPage, return std::make_unique<OfaLanguagesTabPage>(pPage, pController, *rAttrSet); } -static void lcl_Update(std::unique_ptr<SfxVoidItem> pInvalidItems[], std::unique_ptr<SfxBoolItem> pBoolItems[], sal_uInt16 nCount) -{ - SfxViewFrame* pCurrentFrm = SfxViewFrame::Current(); - SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst(); - while(pViewFrm) - { - SfxBindings& rBind = pViewFrm->GetBindings(); - for(sal_uInt16 i = 0; i < nCount; i++) - { - if(pCurrentFrm == pViewFrm) - rBind.InvalidateAll(false); - rBind.SetState( *pInvalidItems[i] ); - rBind.SetState( *pBoolItems[i] ); - } - pViewFrm = SfxViewFrame::GetNext(*pViewFrm); - } -} - OUString OfaLanguagesTabPage::GetAllStrings() { OUString sAllStrings; @@ -1119,8 +1081,8 @@ OUString OfaLanguagesTabPage::GetAllStrings() sAllStrings += pString->get_label() + " "; } - OUString checkButton[] = { u"decimalseparator"_ustr, u"asiansupport"_ustr, u"ctlsupport"_ustr, u"currentdoc"_ustr, - u"ignorelanguagechange"_ustr }; + OUString checkButton[] + = { u"decimalseparator"_ustr, u"currentdoc"_ustr, u"ignorelanguagechange"_ustr }; for (const auto& check : checkButton) { @@ -1141,15 +1103,9 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) /* * Sequence checking only matters when CTL support is enabled. * - * So we only need to check for sequence checking if - * a) previously it was unchecked and is now checked or - * b) it was already checked but the CTL language has changed + * So we only need to check for sequence checking if the CTL language has changed */ - if ( - m_xCTLSupportCB->get_active() && - (m_xCTLSupportCB->get_saved_state() != TRISTATE_TRUE || - m_xComplexLanguageLB->get_active_id_changed_from_saved()) - ) + if (m_xComplexLanguageLB->get_active_id_changed_from_saved()) { //sequence checking has to be switched on depending on the selected CTL language LanguageType eCTLLang = m_xComplexLanguageLB->get_active_id(); @@ -1328,41 +1284,6 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) == MsLangId::getPrimaryLanguage(LANGUAGE_MONGOLIAN_MONGOLIAN_MONGOLIA)); } - if(m_xAsianSupportCB->get_state_changed_from_saved() ) - { - bool bChecked = m_xAsianSupportCB->get_active(); - SvtCJKOptions::SetAll(bChecked); - - //iterate over all bindings to invalidate vertical text direction - const sal_uInt16 STATE_COUNT = 2; - - std::unique_ptr<SfxBoolItem> pBoolItems[STATE_COUNT]; - pBoolItems[0].reset(new SfxBoolItem(SID_VERTICALTEXT_STATE, false)); - pBoolItems[1].reset(new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, false)); - - std::unique_ptr<SfxVoidItem> pInvalidItems[STATE_COUNT]; - pInvalidItems[0].reset(new SfxVoidItem(SID_VERTICALTEXT_STATE)); - pInvalidItems[1].reset(new SfxVoidItem(SID_TEXT_FITTOSIZE_VERTICAL)); - - lcl_Update(pInvalidItems, pBoolItems, STATE_COUNT); - } - - if ( m_xCTLSupportCB->get_state_changed_from_saved() ) - { - SvtSearchOptions aOpt; - aOpt.SetIgnoreDiacritics_CTL(true); - aOpt.SetIgnoreKashida_CTL(true); - aOpt.Commit(); - pLangConfig->aCTLLanguageOptions.SetCTLFontEnabled( m_xCTLSupportCB->get_active() ); - - const sal_uInt16 STATE_COUNT = 1; - std::unique_ptr<SfxBoolItem> pBoolItems[STATE_COUNT]; - pBoolItems[0].reset(new SfxBoolItem(SID_CTLFONT_STATE, false)); - std::unique_ptr<SfxVoidItem> pInvalidItems[STATE_COUNT]; - pInvalidItems[0].reset(new SfxVoidItem(SID_CTLFONT_STATE)); - lcl_Update(pInvalidItems, pBoolItems, STATE_COUNT); - } - if ( pLangConfig->aSysLocaleOptions.IsModified() ) pLangConfig->aSysLocaleOptions.Commit(); @@ -1532,6 +1453,16 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) m_xWesternLanguageLB->set_sensitive( bEnable ); m_xWesternLanguageImg->set_visible( !bEnable ); + bEnable = !pLangConfig->aLinguConfig.IsReadOnly(u"DefaultLocale_CJK"); + m_xAsianLanguageFT->set_sensitive(bEnable); + m_xAsianLanguageLB->set_sensitive(bEnable); + m_xAsianLanguageImg->set_visible(!bEnable); + + bEnable = !pLangConfig->aLinguConfig.IsReadOnly(u"DefaultLocale_CTL"); + m_xComplexLanguageFT->set_sensitive(bEnable); + m_xComplexLanguageLB->set_sensitive(bEnable); + m_xComplexLanguageImg->set_visible(!bEnable); + // check the box "For the current document only" // set the focus to the Western Language box const SfxBoolItem* pLang = rSet->GetItemIfSet(SID_SET_DOCUMENT_LANGUAGE, false ); @@ -1543,63 +1474,9 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) } } -IMPL_LINK(OfaLanguagesTabPage, SupportHdl, weld::Toggleable&, rBox, void) -{ - bool bCheck = rBox.get_active(); - if ( m_xAsianSupportCB.get() == &rBox ) - { - bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly(u"DefaultLocale_CJK"); - bCheck = ( bCheck && !bReadonly ); - m_xAsianLanguageLB->set_sensitive( bCheck ); - if (rBox.get_sensitive()) - m_bOldAsian = bCheck; - } - else if ( m_xCTLSupportCB.get() == &rBox ) - { - bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly(u"DefaultLocale_CTL"); - bCheck = ( bCheck && !bReadonly ); - m_xComplexLanguageLB->set_sensitive( bCheck ); - if (rBox.get_sensitive()) - m_bOldCtl = bCheck; - } - else - SAL_WARN( "cui.options", "OfaLanguagesTabPage::SupportHdl(): wrong rBox" ); -} - -namespace -{ - void lcl_checkLanguageCheckBox(weld::CheckButton& _rCB, bool _bNewValue, bool _bOldValue) - { - if ( _bNewValue ) - _rCB.set_active(true); - else - _rCB.set_active( _bOldValue ); -// #i15082# do not call save_state() in running dialog... -// _rCB.save_state(); - _rCB.set_sensitive( !_bNewValue ); - } -} - IMPL_LINK_NOARG(OfaLanguagesTabPage, LocaleSettingHdl, weld::ComboBox&, void) { LanguageType eLang = m_xLocaleSettingLB->get_active_id(); - SvtScriptType nType = SvtLanguageOptions::GetScriptTypeOfLanguage(eLang); - // first check if CTL must be enabled - // #103299# - if CTL font setting is not readonly - if(!pLangConfig->aCTLLanguageOptions.IsReadOnly(SvtCTLOptions::E_CTLFONT)) - { - bool bIsCTLFixed = bool(nType & SvtScriptType::COMPLEX); - lcl_checkLanguageCheckBox(*m_xCTLSupportCB, bIsCTLFixed, m_bOldCtl); - SupportHdl(*m_xCTLSupportCB); - } - // second check if CJK must be enabled - // #103299# - if CJK support is not readonly - if(!SvtCJKOptions::IsAnyReadOnly()) - { - bool bIsCJKFixed = bool(nType & SvtScriptType::ASIAN); - lcl_checkLanguageCheckBox(*m_xAsianSupportCB, bIsCJKFixed, m_bOldAsian); - SupportHdl(*m_xAsianSupportCB); - } const NfCurrencyEntry& rCurr = SvNumberFormatter::GetCurrencyEntry( (eLang == LANGUAGE_USER_SYSTEM_CONFIG) ? MsLangId::getConfiguredSystemLanguage() : eLang); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index c73dddab1e5b..30d8c081241c 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -135,8 +135,6 @@ struct LanguageConfig_Impl; class OfaLanguagesTabPage : public SfxTabPage { - bool m_bOldAsian; - bool m_bOldCtl; std::unique_ptr<LanguageConfig_Impl> pLangConfig; OUString m_sUserLocaleValue; @@ -163,16 +161,15 @@ class OfaLanguagesTabPage : public SfxTabPage std::unique_ptr<weld::Label> m_xWesternLanguageFT; std::unique_ptr<weld::Widget> m_xWesternLanguageImg; std::unique_ptr<SvxLanguageBox> m_xAsianLanguageLB; + std::unique_ptr<weld::Label> m_xAsianLanguageFT; + std::unique_ptr<weld::Widget> m_xAsianLanguageImg; std::unique_ptr<SvxLanguageBox> m_xComplexLanguageLB; + std::unique_ptr<weld::Label> m_xComplexLanguageFT; + std::unique_ptr<weld::Widget> m_xComplexLanguageImg; std::unique_ptr<weld::CheckButton> m_xCurrentDocCB; - std::unique_ptr<weld::CheckButton> m_xAsianSupportCB; - std::unique_ptr<weld::Widget> m_xAsianSupportImg; - std::unique_ptr<weld::CheckButton> m_xCTLSupportCB; - std::unique_ptr<weld::Widget> m_xCTLSupportImg; std::unique_ptr<weld::CheckButton> m_xIgnoreLanguageChangeCB; std::unique_ptr<weld::Widget> m_xIgnoreLanguageChangeImg; - DECL_LINK(SupportHdl, weld::Toggleable&, void); DECL_LINK(LocaleSettingHdl, weld::ComboBox&, void); DECL_LINK(DatePatternsHdl, weld::Entry&, void); diff --git a/cui/uiconfig/ui/optlanguagespage.ui b/cui/uiconfig/ui/optlanguagespage.ui index 85ddf5494fd1..c3ed43d5d35f 100644 --- a/cui/uiconfig/ui/optlanguagespage.ui +++ b/cui/uiconfig/ui/optlanguagespage.ui @@ -238,18 +238,13 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="ctlsupport"> - <property name="label" translatable="yes" context="optlanguagespage|ctlsupport">Complex _text layout:</property> + <object class="GtkLabel" id="complex"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="optlanguagespage|complex">Complex text layout:</property> <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="ctlsupport-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|ctlsupport">Activates complex text layout support. You can now modify the settings corresponding to complex text layout.</property> - </object> - </child> + <property name="mnemonic-widget">complexlanguage</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">1</property> @@ -257,18 +252,13 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="asiansupport"> - <property name="label" translatable="yes" context="optlanguagespage|asiansupport">Asian:</property> + <object class="GtkLabel" id="asian"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="optlanguagespage|asian">Asian:</property> <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="asiansupport-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|asiansupport">Activates Asian languages support. You can now modify the corresponding Asian language settings.</property> - </object> - </child> + <property name="mnemonic-widget">asianlanguage</property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">1</property> @@ -303,7 +293,7 @@ </packing> </child> <child> - <object class="GtkImage" id="lockasiansupport"> + <object class="GtkImage" id="lockasianlanguage"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">center</property> @@ -316,7 +306,7 @@ </packing> </child> <child> - <object class="GtkImage" id="lockctlsupport"> + <object class="GtkImage" id="lockcomplexlanguage"> <property name="can-focus">False</property> <property name="no-show-all">True</property> <property name="halign">center</property> @@ -644,8 +634,8 @@ <widget name="label6"/> <widget name="defaultcurrency"/> <widget name="dataaccpatterns"/> - <widget name="ctlsupport"/> - <widget name="asiansupport"/> + <widget name="complex"/> + <widget name="asian"/> <widget name="western"/> </widgets> </object> diff --git a/sc/qa/uitest/calc_tests8/tdf126248.py b/sc/qa/uitest/calc_tests8/tdf126248.py index 9e65f9c3d5b3..2a4ac07704bf 100644 --- a/sc/qa/uitest/calc_tests8/tdf126248.py +++ b/sc/qa/uitest/calc_tests8/tdf126248.py @@ -39,10 +39,6 @@ class tdf126248(UITestCase): xxLanguageEntryGeneralEntry = xLanguageEntry.getChild('0') xxLanguageEntryGeneralEntry.executeAction("SELECT", tuple()) - # Check asian support is enabled - asianlanguage = xDialog.getChild("asiansupport") - self.assertEqual("true", get_state_as_dict(asianlanguage)['Selected']) - localeSetting = xDialog.getChild("localesetting") select_by_text(localeSetting, language) self.ui_test.wait_until_property_is_updated(localeSetting, 'SelectEntryText', language) diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 3cc774e4268c..258dcabec3cb 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -34,43 +34,57 @@ namespace SvtCJKOptions bool IsCJKFontEnabled() { SvtCJKOptions_Load(); - return officecfg::Office::Common::I18N::CJK::CJKFont::get(); + + // tdf#168719: The CJK font can no longer be disabled + return true; } bool IsVerticalTextEnabled() { SvtCJKOptions_Load(); - return officecfg::Office::Common::I18N::CJK::VerticalText::get(); + + // tdf#168719: The CJK font can no longer be disabled + return true; } bool IsAsianTypographyEnabled() { SvtCJKOptions_Load(); - return officecfg::Office::Common::I18N::CJK::AsianTypography::get(); + + // tdf#168719: The CJK font can no longer be disabled + return true; } bool IsJapaneseFindEnabled() { SvtCJKOptions_Load(); - return officecfg::Office::Common::I18N::CJK::JapaneseFind::get(); + + // tdf#168719: The CJK font can no longer be disabled + return true; } bool IsRubyEnabled() { SvtCJKOptions_Load(); - return officecfg::Office::Common::I18N::CJK::Ruby::get(); + + // tdf#168719: The CJK font can no longer be disabled + return true; } bool IsChangeCaseMapEnabled() { SvtCJKOptions_Load(); - return officecfg::Office::Common::I18N::CJK::ChangeCaseMap::get(); + + // tdf#168719: The CJK font can no longer be disabled + return true; } bool IsDoubleLinesEnabled() { SvtCJKOptions_Load(); - return officecfg::Office::Common::I18N::CJK::DoubleLines::get(); + + // tdf#168719: The CJK font can no longer be disabled + return true; } void SetAll(bool bSet) diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 5f0de9d9e00c..b254d77bdbde 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -453,7 +453,8 @@ void SvtCTLOptions::SetCTLFontEnabled( bool _bEnabled ) bool SvtCTLOptions::IsCTLFontEnabled() { - return officecfg::Office::Common::I18N::CTL::CTLFont::get(); + // tdf#168719: The CTL font can no longer be disabled + return true; } void SvtCTLOptions::SetCTLVerticalText(bool bVertical) @@ -464,7 +465,8 @@ void SvtCTLOptions::SetCTLVerticalText(bool bVertical) bool SvtCTLOptions::IsCTLVerticalText() { - return officecfg::Office::Common::I18N::CTL::CTLVerticalText::get(); + // tdf#168719: The CTL font can no longer be disabled + return true; } void SvtCTLOptions::SetCTLSequenceChecking( bool _bEnabled ) diff --git a/sw/qa/uitest/findReplace/tdf118208.py b/sw/qa/uitest/findReplace/tdf118208.py index 3735c6cdab53..b9e62b814274 100644 --- a/sw/qa/uitest/findReplace/tdf118208.py +++ b/sw/qa/uitest/findReplace/tdf118208.py @@ -25,13 +25,6 @@ class tdf118208(UITestCase): xxLanguageEntryGeneralEntry = xLanguageEntry.getChild('0') xxLanguageEntryGeneralEntry.executeAction("SELECT", tuple()) # General - asianlanguage = xDialog.getChild("asiansupport") - complexlanguage = xDialog.getChild("ctlsupport") - if (get_state_as_dict(asianlanguage)["Selected"]) != enabled: - asianlanguage.executeAction("CLICK", tuple()) - if (get_state_as_dict(complexlanguage)["Selected"]) != enabled: - complexlanguage.executeAction("CLICK", tuple()) - def test_tdf118208_search_dialog_format_crash(self): with self.ui_test.load_file(get_url_for_data_file("tdf118208.odt")) as writer_doc: # 1. Open the attached file.
