diff options
author | Muhammet Kara <muhammet.kara@pardus.org.tr> | 2016-06-16 11:23:32 +0300 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-06-16 20:52:46 +0000 |
commit | 29e91d5eedd2bf20504ce9ada625d33fec19dc9e (patch) | |
tree | e4cfa333bb7660e614dfc18896c490bc1a9bee8f | |
parent | e50caebc02ee2045a38a39b4a4c644da0d678541 (diff) |
Ensure updated accessible names in SwSortDlg ctor
Set accessible names after the conditional block because text of m_pColLbl may be changed
Change-Id: I2902fd346384be2c9ffa471c71ad94cacede7d14
Reviewed-on: https://gerrit.libreoffice.org/26352
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-rw-r--r-- | sw/source/ui/misc/srtdlg.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 9a96a3bca014..3649dd90ec9e 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -148,10 +148,6 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) get(m_pLangLB, "langlb"); get(m_pCaseCB, "matchcase"); - m_pColEdt1->SetAccessibleName(m_pColLbl->GetText()); - m_pColEdt2->SetAccessibleName(m_pColLbl->GetText()); - m_pColEdt3->SetAccessibleName(m_pColLbl->GetText()); - m_pDelimEdt->SetMaxTextLen( 1 ); if(rSh.GetSelectionType() & (nsSelectionType::SEL_TBL|nsSelectionType::SEL_TBL_CELLS) ) @@ -170,6 +166,12 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) m_pColLbl->SetText(aColText); } + // Set accessible names here because text of m_pColLbl may be changed + // by the if-else block above + m_pColEdt1->SetAccessibleName(m_pColLbl->GetText()); + m_pColEdt2->SetAccessibleName(m_pColLbl->GetText()); + m_pColEdt3->SetAccessibleName(m_pColLbl->GetText()); + // initialise Link<Button*,void> aLk = LINK(this,SwSortDlg, CheckHdl); m_pKeyCB1->SetClickHdl( aLk ); |