From 50f0bb85b7e18001886fdf8bb03eb1d138838b90 Mon Sep 17 00:00:00 2001 From: Oliver-Rainer Wittmann Date: Tue, 11 Feb 2014 13:25:08 +0000 Subject: Resolves: #i124179# trigger update User Fields... and related Input Fields when user directly edits a User Field Input Field - assure that no recursive updates occur (cherry picked from commit 3c2b5242e81575ec4b6c110afd88894670bd2283) Conflicts: sw/inc/txtfld.hxx sw/source/core/fields/expfld.cxx sw/source/core/fields/usrfld.cxx Change-Id: I36af4d5e8008f16737e3ec14c1ec737a5f43d3b1 --- sw/inc/txtfld.hxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sw/inc/txtfld.hxx') diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index cfab932a8660..b973aaadd469 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -83,6 +83,8 @@ public: virtual sal_Int32* GetEnd(); + void LockNotifyContentChange(); + void UnlockNotifyContentChange(); virtual void NotifyContentChange( SwFmtFld& rFmtFld ); void UpdateTextNodeContent( const OUString& rNewContent ); @@ -92,6 +94,8 @@ public: private: sal_Int32 m_nEnd; + + bool m_bLockNotifyContentChange; }; #endif -- cgit