diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-10-22 17:53:18 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-10-22 17:53:18 +0200 |
| commit | 8485708f3001fca132c3353c464fe7187ef62bed (patch) | |
| tree | f04855d6ac5ac30dee60841e4d68384d366baf2f /sw/inc/fldbas.hxx | |
| parent | sw34bf01: merge fix for #i114999# (diff) | |
| download | core-8485708f3001fca132c3353c464fe7187ef62bed.tar.gz core-8485708f3001fca132c3353c464fe7187ef62bed.zip | |
sw34bf01: #i85766# #i112425#: prevent expansion of fields in actual documents:
because various fields only expand to correct values with "special handling"
that is only done in text formatting, use the clipboard value cache even in
_real_ documents.
Diffstat (limited to 'sw/inc/fldbas.hxx')
| -rw-r--r-- | sw/inc/fldbas.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index d46ca308c3ba..fd570f623eaf 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -326,10 +326,14 @@ public: virtual SwFieldType* ChgTyp( SwFieldType* ); /** expand the field. - @param bInClipboard field is in clipboard document? + @param bCached return cached field value. + @remark most callers should use the cached field value. + this is because various fields need special handing + (ChangeExpansion()) to return correct values, and only + SwTxtFormatter::NewFldPortion() sets things up properly. @return the generated text (suitable for display) */ - String ExpandField(bool const bInClipboard) const; + String ExpandField(bool const bCached) const; virtual String GetFieldName() const; |