From a00757e75b7d55239f97c1ca9e50c68252ff227f Mon Sep 17 00:00:00 2001 From: Muhammet Kara Date: Wed, 8 Jun 2016 14:43:53 +0300 Subject: [PATCH] Move accessibility relations to .ui files, Part 9: tdf#87026 By removing unnecessary variables/strings/function calls, and making proper changes in the related .ui files. Change-Id: I52e3f2a16519aee13b06f0efc6beb3385bcb0f1c Reviewed-on: https://gerrit.libreoffice.org/26066 Tested-by: Jenkins Reviewed-by: Katarina Behrens --- cui/source/inc/cuires.hrc | 4 +- cui/source/options/optlingu.cxx | 8 -- cui/source/options/optlingu.src | 12 --- cui/uiconfig/ui/optlingupage.ui | 23 +++++- .../xsltdialog/xmlfiltersettingsdialog.cxx | 1 - filter/uiconfig/ui/xmlfiltersettings.ui | 7 +- formula/source/ui/dlg/formula.cxx | 1 - formula/uiconfig/ui/formuladialog.ui | 15 ++-- sw/source/ui/index/cnttab.cxx | 1 - sw/source/ui/table/tabledlg.cxx | 6 -- sw/uiconfig/swriter/ui/tabletextflowpage.ui | 76 +++++-------------- sw/uiconfig/swriter/ui/tocdialog.ui | 7 +- 12 files changed, 61 insertions(+), 100 deletions(-) diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 4fa00c008f30..376117cafc9a 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -378,9 +378,7 @@ #define RID_SVXSTR_HYPH_SPECIAL (RID_SVX_START + 1232) #define RID_SVXSTR_NUM_MIN_WORDLEN (RID_SVX_START + 1233) #define RID_SVXSTR_GRAMMAR_AUTO (RID_SVX_START + 1234) -#define RID_SVXSTR_LINGU_MODULES_EDIT (RID_SVX_START + 1235) -#define RID_SVXSTR_LINGU_DICS_EDIT_DIC (RID_SVX_START + 1236) -#define RID_SVXSTR_LINGU_OPTIONS_EDIT (RID_SVX_START + 1237) +// There is a gap here because of removed strings #define RID_SVXSTR_CHG_MATH (RID_SVX_START + 1238) #define RID_SVXSTR_CHG_WRITER (RID_SVX_START + 1239) diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index fd1cdd5dcdb8..29f30ace352c 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1088,14 +1088,6 @@ SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) else m_pMoreDictsLink->Hide(); - OUString sAccessibleNameModuleEdit(CUI_RES(RID_SVXSTR_LINGU_MODULES_EDIT)); - OUString sAccessibleNameDicsEdit (CUI_RES(RID_SVXSTR_LINGU_DICS_EDIT_DIC)); - OUString sAccessibleNameOptionEdit(CUI_RES(RID_SVXSTR_LINGU_OPTIONS_EDIT)); - - m_pLinguModulesEditPB->SetAccessibleName(sAccessibleNameModuleEdit); - m_pLinguDicsEditPB->SetAccessibleName(sAccessibleNameDicsEdit); - m_pLinguOptionsEditPB->SetAccessibleName(sAccessibleNameOptionEdit); - xProp = SvxGetLinguPropertySet(); xDicList.set( SvxGetDictionaryList(), UNO_QUERY ); if (xDicList.is()) diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src index 5621f89a9e9d..084f3a902de6 100644 --- a/cui/source/options/optlingu.src +++ b/cui/source/options/optlingu.src @@ -83,17 +83,5 @@ String RID_SVXSTR_HYPH_SPECIAL { Text [ en-US ] = "Hyphenate special regions"; }; -String RID_SVXSTR_LINGU_MODULES_EDIT -{ - Text [ en-US ] = "Edit Available language modules"; -}; -String RID_SVXSTR_LINGU_DICS_EDIT_DIC -{ - Text [ en-US ] = "Edit User-defined dictionaries"; -}; -String RID_SVXSTR_LINGU_OPTIONS_EDIT -{ - Text [ en-US ] = "Edit Options"; -}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui index ad7d57731e12..5034a5df4088 100644 --- a/cui/uiconfig/ui/optlingupage.ui +++ b/cui/uiconfig/ui/optlingupage.ui @@ -1,5 +1,5 @@ - + @@ -44,10 +44,10 @@ True False - 0 _Available language modules: True lingumodules:border + 0 0 @@ -77,6 +77,11 @@ True start True + + + Edit Available language modules + + 1 @@ -104,10 +109,10 @@ True False - 0 _User-defined dictionaries: True lingudicts:border + 0 0 @@ -157,6 +162,11 @@ True True True + + + Edit User-defined dictionaries + + False @@ -205,10 +215,10 @@ True False - 0 _Options: True linguoptions:border + 0 0 @@ -255,6 +265,11 @@ True start True + + + Edit Options + + 1 diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 6216673e7adf..e22acfe5588e 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -79,7 +79,6 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent, m_pFilterListBox->SetDeselectHdl( LINK( this, XMLFilterSettingsDialog, SelectionChangedHdl_Impl ) ); m_pFilterListBox->SetDoubleClickHdl( LINK( this, XMLFilterSettingsDialog, DoubleClickHdl_Impl ) ); m_pFilterListBox->SetAccessibleName(RESIDSTR(STR_XML_FILTER_LISTBOX)); - m_pCtrlFilterList->SetAccessibleName(RESIDSTR(STR_XML_FILTER_LISTBOX)); m_pFilterListBox->SetHelpId(m_pCtrlFilterList->GetHelpId()); m_pPBNew->SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) ); diff --git a/filter/uiconfig/ui/xmlfiltersettings.ui b/filter/uiconfig/ui/xmlfiltersettings.ui index e8a24249ab3b..79de962e1205 100644 --- a/filter/uiconfig/ui/xmlfiltersettings.ui +++ b/filter/uiconfig/ui/xmlfiltersettings.ui @@ -1,5 +1,5 @@ - + @@ -146,6 +146,11 @@ 100 True False + + + XML Filter List + + True diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index cedd2f3fda52..b0925fbe4d32 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -295,7 +295,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent pMEdit = m_pMEFormula->GetEdit(); - m_pMEFormula->SetAccessibleName(m_pFtFormula->GetText()); pMEdit->SetAccessibleName(m_pFtFormula->GetText()); m_aEditHelpId = pMEdit->GetHelpId(); diff --git a/formula/uiconfig/ui/formuladialog.ui b/formula/uiconfig/ui/formuladialog.ui index 0b7137b97c0b..613272bc13ce 100644 --- a/formula/uiconfig/ui/formuladialog.ui +++ b/formula/uiconfig/ui/formuladialog.ui @@ -1,5 +1,5 @@ - + @@ -281,9 +281,9 @@ True False start + True 0 0 - True @@ -298,9 +298,9 @@ True False start + True 0 0 - True 0 @@ -313,9 +313,9 @@ False start True + True 0 0 - True 0 @@ -341,10 +341,10 @@ False start True - 1 For_mula True ed_formula + 1 0 @@ -389,6 +389,11 @@ True True True + + + Formula + + False diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index d8383ce90a3c..18945f4fb230 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -314,7 +314,6 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& m_pShowExampleCB->Check( SW_MOD()->GetModuleConfig()->IsShowIndexPreview()); - m_pExampleContainerWIN->SetAccessibleName(m_pShowExampleCB->GetText()); SetViewAlign( WindowAlign::Left ); // SetViewWindow does not work if the dialog is visible! diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 139712ad4946..c5fe6f82cd23 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1301,12 +1301,6 @@ SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pTextDirectionLB, "textdirection"); get(m_pVertOrientLB, "vertorient"); - m_pPgBrkRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); - m_pColBrkRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); - m_pPgBrkBeforeRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); - m_pPgBrkAfterRB->SetAccessibleRelationMemberOf(m_pPgBrkCB); - m_pPageCollLB->SetAccessibleName(m_pPageCollCB->GetText()); - m_pPgBrkCB->SetClickHdl(LINK(this, SwTextFlowPage, PageBreakHdl_Impl)); m_pPgBrkBeforeRB->SetClickHdl( LINK( this, SwTextFlowPage, PageBreakPosHdl_Impl ) ); diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui index 9af0800155cd..76b2f3c6172b 100644 --- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui +++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui @@ -1,6 +1,7 @@ + - + 9999 1 @@ -103,8 +104,6 @@ 0 0 - 1 - 1 @@ -118,12 +117,13 @@ True True column + + + 1 0 - 1 - 1 @@ -136,12 +136,13 @@ 0 True page + + + 2 0 - 1 - 1 @@ -155,12 +156,13 @@ True True after + + + 1 1 - 1 - 1 @@ -172,12 +174,13 @@ True 0 True + + + 2 1 - 1 - 1 @@ -187,8 +190,6 @@ 0 0 - 1 - 1 @@ -212,8 +213,6 @@ 0 0 - 1 - 1 @@ -227,8 +226,6 @@ 2 0 - 1 - 1 @@ -236,14 +233,11 @@ True True - True adjustment1 3 0 - 1 - 1 @@ -255,20 +249,21 @@ + + + With Page Style + + 1 0 - 1 - 1 0 1 - 1 - 1 @@ -284,8 +279,6 @@ 0 2 - 1 - 1 @@ -303,8 +296,6 @@ 0 3 - 1 - 1 @@ -320,8 +311,6 @@ 0 4 - 1 - 1 @@ -340,8 +329,6 @@ 0 0 - 1 - 1 @@ -353,16 +340,12 @@ 1 0 - 1 - 1 0 6 - 1 - 1 @@ -383,8 +366,6 @@ 0 0 - 1 - 1 @@ -403,8 +384,6 @@ 0 0 - 1 - 1 @@ -416,8 +395,6 @@ 2 0 - 1 - 1 @@ -425,30 +402,23 @@ True True - True adjustment2 1 0 - 1 - 1 1 0 - 1 - 1 0 5 - 1 - 1 @@ -469,8 +439,6 @@ 0 0 - 1 - 1 @@ -501,8 +469,6 @@ 0 0 - 1 - 1 @@ -514,8 +480,6 @@ 1 0 - 1 - 1 @@ -536,8 +500,6 @@ 0 1 - 1 - 1 diff --git a/sw/uiconfig/swriter/ui/tocdialog.ui b/sw/uiconfig/swriter/ui/tocdialog.ui index 3857a2f0364b..d90952818a15 100644 --- a/sw/uiconfig/swriter/ui/tocdialog.ui +++ b/sw/uiconfig/swriter/ui/tocdialog.ui @@ -1,5 +1,5 @@ - + @@ -114,6 +114,11 @@ True False + + + Preview + + False