[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source vcl/source

[Libreoffice Gerrit user]

 sw/source/ui/config/optload.cxx |    2 +-
 vcl/source/app/salvtables.cxx   |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 30a6c065f43509a37b24ebcf57d56b6dbfcbb6ac
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jan 22 15:23:07 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jan 23 18:22:29 2019 +0100

    Resolves: tdf#122874 select row when user clicks toggle in row
    
    Change-Id: I761d0566eef07eadf9e583566b8707b18563ee33
    Reviewed-on: https://gerrit.libreoffice.org/66743
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at 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 94260c2ddbf6..83e12c3eb41c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2423,6 +2423,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);