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:05:45 +0200 |
commit | d406785b057811e49e74abd62c45abe8fcaa782d (patch) | |
tree | 8d303a2151588f3f16ada6057e8eaf7211dab3d3 /svx | |
parent | 91d8af2c5cf4e8ec0f1ce0e532e0c896de77750b (diff) |
tdf#117537 block rentry to CheckAndMarkUnknownFont
Change-Id: I70e75a39d13e93e929c7aef5407b1100bb2a7c12
Reviewed-on: https://gerrit.libreoffice.org/55130
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-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 ) |