From 522fee9a58d4cdbfb207225ecb6cfa6b5a1a275d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Jul 17 2018 10:22:05 +0000
Subject: drop merged 0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch


---

diff --git a/0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch b/0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
deleted file mode 100644
index d60ddb8..0000000
--- a/0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c6c82096301180cfa7942dd9fb9d1cb66c7ecc04 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Thu, 31 May 2018 13:49:40 +0100
-Subject: [PATCH] tdf#117537 block rentry to CheckAndMarkUnknownFont
-
-Change-Id: I70e75a39d13e93e929c7aef5407b1100bb2a7c12
-Reviewed-on: https://gerrit.libreoffice.org/55131
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
----
- svx/source/tbxctrls/tbcontrl.cxx | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
-index 997520fd5e32..c5c19346ce3f 100644
---- a/svx/source/tbxctrls/tbcontrl.cxx
-+++ b/svx/source/tbxctrls/tbcontrl.cxx
-@@ -192,6 +192,7 @@ private:
-     Reference< XDispatchProvider > m_xDispatchProvider;
-     Reference< XFrame >            m_xFrame;
-     bool            mbEndPreview;
-+    bool            mbCheckingUnknownFont;
- 
-     void            ReleaseFocus_Impl();
-     void            EnableControls_Impl();
-@@ -970,7 +971,8 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* pParent, const Reference<
-     bRelease           ( true ),
-     m_xDispatchProvider( rDispatchProvider ),
-     m_xFrame (_xFrame),
--    mbEndPreview(false)
-+    mbEndPreview(false),
-+    mbCheckingUnknownFont(false)
- {
-     SetOptimalSize();
-     EnableControls_Impl();
-@@ -1002,6 +1004,9 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent&, event,
- {
-     if( event.GetId() != VclEventId::EditModify )
-         return;
-+    if (mbCheckingUnknownFont) //tdf#117537 block rentry
-+        return;
-+    mbCheckingUnknownFont = true;
-     OUString fontname = GetSubEdit()->GetText();
-     lcl_GetDocFontList( &pFontList, this );
-     // If the font is unknown, show it in italic.
-@@ -1024,6 +1029,7 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent&, event,
-             SetQuickHelpText( SvxResId( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE ));
-         }
-     }
-+    mbCheckingUnknownFont = false;
- }
- 
- void SvxFontNameBox_Impl::Update( const css::awt::FontDescriptor* pFontDesc )
--- 
-2.17.0
-
diff --git a/libreoffice.spec b/libreoffice.spec
index 2a50e2a..a0ef511 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -273,9 +273,8 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
 Patch3: 0001-gtk3-only-for-3.20.patch
 Patch4: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch
 Patch5: 0001-request-installation-of-langpack-via-packagekit.patch
-Patch6: 0001-tdf-117537-block-rentry-to-CheckAndMarkUnknownFont.patch
-Patch7: 0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
-Patch8: 0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
+Patch6: 0001-Explicitly-qualify-ICU-types-with-icu-namespace.patch
+Patch7: 0001-const-fixes-for-python3-devel-3.7.0-1.fc29.x86_64.patch
 
 %if 0%{?rhel}
 # not upstreamed