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

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/versdlg.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit dd8e9e7e271ce2d60a35a778ac265e8dda25c060
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Apr 26 14:28:51 2019 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Sat Apr 27 15:35:53 2019 +0200

    Resolves: tdf#124979 don't select item while list frozen
    
    Change-Id: Ifbad7984223b8d18eb353ec773705b902cab7176
    Reviewed-on: https://gerrit.libreoffice.org/71368
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 13724cf6a54c..78ba4262baa6 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -218,6 +218,7 @@ void SfxVersionDialog::Init_Impl()
     SfxMedium* pMedium = pObjShell->GetMedium();
     uno::Sequence < util::RevisionTag > aVersions = pMedium->GetVersionList( true );
     m_pTable.reset(new SfxVersionTableDtor( aVersions ));
+    m_xVersionBox->freeze();
     for (size_t n = 0; n < m_pTable->size(); ++n)
     {
         SfxVersionInfo *pInfo = m_pTable->at( n );
@@ -227,6 +228,7 @@ void SfxVersionDialog::Init_Impl()
         m_xVersionBox->set_text(nLastRow, pInfo->aAuthor, 1);
         m_xVersionBox->set_text(nLastRow, ConvertWhiteSpaces_Impl(pInfo->aComment), 2);
     }
+    m_xVersionBox->thaw();
 
     if (auto nCount = m_pTable->size())
         m_xVersionBox->select(nCount - 1);
@@ -332,8 +334,8 @@ IMPL_LINK(SfxVersionDialog, ButtonHdl_Impl, weld::Button&, rButton, void)
             m_pViewFrame->GetBindings().ExecuteSynchron( SID_SAVEDOC, aItems );
             m_xVersionBox->freeze();
             m_xVersionBox->clear();
-            Init_Impl();
             m_xVersionBox->thaw();
+            Init_Impl();
         }
     }
     else if (&rButton == m_xDeleteButton.get() && nEntry != -1)
@@ -343,8 +345,8 @@ IMPL_LINK(SfxVersionDialog, ButtonHdl_Impl, weld::Button&, rButton, void)
         pObjShell->SetModified();
         m_xVersionBox->freeze();
         m_xVersionBox->clear();
-        Init_Impl();
         m_xVersionBox->thaw();
+        Init_Impl();
     }
     else if (&rButton == m_xOpenButton.get() && nEntry != -1)
     {