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/core/fields/cellfml.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/core/fields/cellfml.cxx')
| -rw-r--r-- | sw/source/core/fields/cellfml.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index aa46869bca1a..182ed12d6ddd 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -203,7 +203,8 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const break; default: - nRet = rCalcPara.rCalc.Calculate( pFld->Expand() ).GetDouble(); + String const value(pFld->ExpandField(pDoc->IsClipBoard())); + nRet = rCalcPara.rCalc.Calculate(value).GetDouble(); } } else |