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

[Caolán McNamara (via logerrit)]

 cui/source/options/fontsubs.cxx             |    8 ++++++++
 sw/source/uibase/dialog/watermarkdialog.cxx |    2 ++
 2 files changed, 10 insertions(+)

New commits:
commit 1b5eee9efe49787ae1acc5ad6de5b9cf1fcc07ea
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 3 11:55:13 2020 +0000
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Feb 5 11:01:25 2020 +0100

    Related: tdf#130143 freeze/thaw around bulk insert
    
    Change-Id: Iedb1229b56b5e7f1af1779b830cf324bcc8735e4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87864
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index e56543fb1e04..0504112acc7e 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -189,6 +189,11 @@ void  SvxFontSubstTabPage::Reset( const SfxItemSet* )
     m_xCheckLB->freeze();
     m_xCheckLB->clear();
 
+    m_xFont1CB->freeze();
+    m_xFont1CB->clear();
+    m_xFont2CB->freeze();
+    m_xFont2CB->clear();
+
     FontList aFntLst(Application::GetDefaultDevice());
     sal_uInt16 nFontCount = aFntLst.GetFontNameCount();
     for (sal_uInt16 i = 0; i < nFontCount; ++i)
@@ -198,6 +203,9 @@ void  SvxFontSubstTabPage::Reset( const SfxItemSet* )
         m_xFont2CB->append_text(rFontMetric.GetFamilyName());
     }
 
+    m_xFont2CB->thaw();
+    m_xFont1CB->thaw();
+
     sal_Int32 nCount = m_xConfig->SubstitutionCount();
     if (nCount)
         m_xUseTableCB->set_active(m_xConfig->IsEnabled());
diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx
index ad16d5bd94f6..09ac8ed94c70 100644
--- a/sw/source/uibase/dialog/watermarkdialog.cxx
+++ b/sw/source/uibase/dialog/watermarkdialog.cxx
@@ -55,12 +55,14 @@ void SwWatermarkDialog::InitFields()
         pFontList = xFontList.get();
     }
 
+    m_xFont->freeze();
     sal_uInt16 nFontCount = pFontList->GetFontNameCount();
     for (sal_uInt16 i = 0; i < nFontCount; ++i)
     {
         const FontMetric& rFontMetric = pFontList->GetFontName(i);
         m_xFont->append_text(rFontMetric.GetFamilyName());
     }
+    m_xFont->thaw();
 
     m_xOKButton->connect_clicked(LINK(this, SwWatermarkDialog, OKButtonHdl));