summaryrefslogtreecommitdiff
path: root/sw/inc/txtfld.hxx
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2014-02-11 13:25:08 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-11 20:21:46 +0000
commit50f0bb85b7e18001886fdf8bb03eb1d138838b90 (patch)
treebee06202e29edd53510b0b54050f655636929dff /sw/inc/txtfld.hxx
parent2540c06a238123b1284912d4d85a6ae873fffd2f (diff)
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
Diffstat (limited to 'sw/inc/txtfld.hxx')
-rw-r--r--sw/inc/txtfld.hxx4
1 files changed, 4 insertions, 0 deletions
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