diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-31 13:49:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-31 22:03:36 +0200 |
| commit | 1b6026f6661674439a638ae6c4d5c3771fafdb22 (patch) | |
| tree | 049206378785168811837abe4b49d2bb1c950f94 | |
| parent | 7488943c329516c35504fe86c36251c83b24cf74 (diff) | |
tdf#117537 block rentry to CheckAndMarkUnknownFont
Change-Id: I70e75a39d13e93e929c7aef5407b1100bb2a7c12
Reviewed-on: https://gerrit.libreoffice.org/55129
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 41145935cf5f..ae103afddc21 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -193,6 +193,7 @@ private: Reference< XDispatchProvider > m_xDispatchProvider; Reference< XFrame > m_xFrame; bool mbEndPreview; + bool mbCheckingUnknownFont; void ReleaseFocus_Impl(); void EnableControls_Impl(); @@ -971,7 +972,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(); @@ -1003,6 +1005,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. @@ -1025,6 +1030,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 ) |