sw/source/ui/config/optload.cxx | 2 +- vcl/source/app/salvtables.cxx | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit b4b5c22f692a45853cb32c19f8ad011803322dd5 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Tue Jan 22 15:23:07 2019 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Wed Jan 23 18:24:11 2019 +0100 Resolves: tdf#122874 select row when user clicks toggle in row Change-Id: I761d0566eef07eadf9e583566b8707b18563ee33 Reviewed-on: https://gerrit.libreoffice.org/66744 Reviewed-by: Michael Stahl <michael.st...@cib.de> Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org> Tested-by: Xisco Faulí <xiscofa...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index b2d5d0673533..780095714dd7 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -658,7 +658,7 @@ void SwCaptionOptPage::Reset( const SfxItemSet* rSet) m_xLbCaptionOrder->set_active( SW_MOD()->GetModuleConfig()->IsCaptionOrderNumberingFirst() ? 1 : 0); m_xCheckLB->select(0); - UpdateEntry(0); + ShowEntryHdl(*m_xCheckLB); } void SwCaptionOptPage::SetOptions(const sal_uLong nPos, diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index b6da21a452f1..fef8e330f97a 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -2414,6 +2414,10 @@ IMPL_LINK(SalInstanceTreeView, ToggleHdl, SvLBoxButtonData*, pData, void) SvTreeListEntry* pEntry = pData->GetActEntry(); SvLBoxButton* pBox = pData->GetActBox(); + // tdf#122874 Select the row, calling SelectHdl, before handling + // the toggle + m_xTreeView->Select(pEntry, true); + for (int i = 1, nCount = pEntry->ItemCount(); i < nCount; ++i) { SvLBoxItem& rItem = pEntry->GetItem(i); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits