diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-06-13 14:08:22 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-13 20:32:14 +0200 |
| commit | cd94a84b89c476760ad74bf088a5d6f8ba4ce209 (patch) | |
| tree | 8093be7a73ad668d1ee014aa4d0122504e215555 /sw/inc/txtfld.hxx | |
| parent | b8bee05dbf85bc4f5834520aa5d64e9ae18aba4e (diff) | |
125044: - use field's content cache on <SwTxtFld> construction only
... for clipboard documents
- assure invalidation and updates on code to update fields
(cherry picked from commit 3d4d98d4d98bc62474ec295cdc4d070a01dcac13)
The substantial bug was already fixed years ago by commit
9519deda120b73b72e75d89c3b2ae3d66220ec2d
Conflicts:
sw/inc/txtannotationfld.hxx
sw/inc/txtfld.hxx
sw/source/core/crsr/crstrvl.cxx
sw/source/core/txtnode/atrfld.cxx
sw/source/core/txtnode/thints.cxx
Change-Id: Ib4965c5d443b60bab11bad1a9249fc6547976a3c
Diffstat (limited to 'sw/inc/txtfld.hxx')
| -rw-r--r-- | sw/inc/txtfld.hxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index 3f4d41f13de7..44c5c5e3f901 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -39,12 +39,7 @@ public: void CopyTxtFld( SwTxtFld *pDest ) const; - void ExpandTxtFld() const; - void ExpandAlways() - { - m_aExpand += " "; // changing current value to assure that <ExpandTxtFld()> changes the value. - ExpandTxtFld(); - } + void ExpandTxtFld( const bool bForceNotify = false ) const; // get and set TxtNode pointer SwTxtNode* GetpTxtNode() const |