From 2eb92eaea9ad74b1488246af3c334c3829af36a1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 15 Apr 2019 15:03:14 +0200 Subject: 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 --- sw/inc/txtfld.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/inc/txtfld.hxx') 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; -- cgit