diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-15 15:03:14 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-15 16:05:06 +0200 |
| commit | 2eb92eaea9ad74b1488246af3c334c3829af36a1 (patch) | |
| tree | 6d4629a29379ad3deff65a43fa43c6942e76eae0 /sw/inc/txtfld.hxx | |
| parent | 19ddbc1fc5e80a535e0f313d4491f7ae8441df57 (diff) | |
sw: fix recursive SwTextInputField::LockNotifyContentChange
(related: tdf#123968)
The assertion added in commit 742baabbe4d077e1ba913a7989300908f4637ac7
is triggered during ODF import of import fields associated with user
field types; there is a 3 level recursion of the SwUserFieldType for one
variable calling the SwInputFieldType calling SwUserFieldType of another
variable...
Change-Id: I54fc56733c7375cfdb6439b02cf21c4d852c2b4c
Reviewed-on: https://gerrit.libreoffice.org/70768
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sw/inc/txtfld.hxx')
| -rw-r--r-- | sw/inc/txtfld.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index 11c13edeedc9..38ca9caa6251 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -87,7 +87,7 @@ public: virtual ~SwTextInputField() override; - void LockNotifyContentChange(); + bool LockNotifyContentChange(); void UnlockNotifyContentChange(); virtual void NotifyContentChange( SwFormatField& rFormatField ) override; |