sw/source/ui/misc/srtdlg.cxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 29e91d5eedd2bf20504ce9ada625d33fec19dc9e
Author: Muhammet Kara <muhammet.k...@pardus.org.tr>
Date: Thu Jun 16 11:23:32 2016 +0300
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 <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 9a96a3b..3649dd9 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
