diff options
author | Michael Stahl <mst@openoffice.org> | 2010-05-21 15:21:49 +0200 |
---|---|---|
committer | Michael Stahl <mst@openoffice.org> | 2010-05-21 15:21:49 +0200 |
commit | d20b81017eb53c5c19a8aed6d5f785c469f91808 (patch) | |
tree | ff3d806335bf62299455ced753b5e9d4049eff56 /sw/source/filter/html/htmlfldw.cxx | |
parent | 047c38908df32c7de6634b1d5963b0df71d4e6e8 (diff) |
sw33bf04: #i85766#: prevent field expansion in clipboard:
SwField: add a String member to cache the value.
SwField: wrap Expand() and Copy() methods to use/update cache.
update all callers to pass the clipboard flag to new SwField::ExpandField().
Diffstat (limited to 'sw/source/filter/html/htmlfldw.cxx')
-rw-r--r-- | sw/source/filter/html/htmlfldw.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 2e67ffcde1f8..50b7bdc7ddc8 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -305,7 +305,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, } // Inhalt des Feldes ausgeben - String sExpand( pFld->Expand() ); + String const sExpand( pFld->ExpandField(rWrt.pDoc->IsClipBoard()) ); sal_Bool bNeedsCJKProcessing = sal_False; if( sExpand.Len() ) { |