diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-06-29 11:20:40 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-07-01 11:46:19 +0200 |
commit | 553b7a044c83498288227e261f1de918db6cd421 (patch) | |
tree | cc29b5d84d244b98c8f1b1c10c1d8a1ea6e1215c | |
parent | e754591fc13cf29c21fbbe4fb05146dbf4b60679 (diff) |
Related: tdf#143088 return early on notification from frozen editengine
processing EE_NOTIFY_PROCESSNOTIFICATIONS from an EditEngine with an
UpdateMode mode of false will just to on to cause
AccessibleTextHelper_Impl::GetTextForwarder to throw an exception as a
Frozen EditEngine is considered Invalid so return early instead
Change-Id: I86f9647b7bf839cf3c7cf2f029be8c7c5aeef1f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118071
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins
-rw-r--r-- | svx/source/dialog/weldeditview.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index 1a315930c332..56ce13f12c3a 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -769,6 +769,19 @@ WeldTextForwarder::~WeldTextForwarder() IMPL_LINK(WeldTextForwarder, NotifyHdl, EENotify&, rNotify, void) { + if (EditEngine* pEditEngine = m_rEditAcc.GetEditEngine()) + { + if (rNotify.eNotificationType == EE_NOTIFY_PROCESSNOTIFICATIONS + && !pEditEngine->GetUpdateMode()) + { + // tdf#143088 an UpdateMode of false will just to on to cause + // AccessibleTextHelper_Impl::GetTextForwarder to throw an + // exception as a Frozen EditEngine is considered Invalid so return + // early instead + return; + } + } + ::std::unique_ptr<SfxHint> aHint = SvxEditSourceHelper::EENotification2Hint(&rNotify); if (aHint) m_rEditSource.GetBroadcaster().Broadcast(*aHint); |