diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-18 18:55:49 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-18 19:57:23 -0600 |
commit | 271b11a3d56ba0c5f542a142ab859a0819530dba (patch) | |
tree | d8719dd652134f89ea980b1a42d3a59a8db949b6 /sw/source/core/fields | |
parent | cc63555fd02217e3b68caccfa5c8a0171aca149c (diff) |
migrate one GetOutputString variatn to OUString
that create some clutter on some of the caller, this will
be resolved as things progress to ward OUString only
This is done that way to be incremental and avoid creating too big patches
Change-Id: I4a881d85cc2ee1eb53bc0c0d0902838b1d3720a2
Diffstat (limited to 'sw/source/core/fields')
-rw-r--r-- | sw/source/core/fields/fldbas.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 38bcee9173ce..f2439f1f49f4 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -511,11 +511,15 @@ String SwValueFieldType::ExpandValue( const double& rVal, { String sValue; DoubleToString(sValue, rVal, nFmtLng); - pFormatter->GetOutputString(sValue, nFmt, sExpand, &pCol); + OUString sTempIn(sValue); + OUString sTempOut(sExpand); + pFormatter->GetOutputString(sTempIn, nFmt, sTempOut, &pCol); + sExpand = sTempOut; } else + { pFormatter->GetOutputString(rVal, nFmt, sExpand, &pCol); - + } return sExpand; } @@ -748,11 +752,15 @@ String SwFormulaField::GetExpandedFormula() const { String sValue; ((SwValueFieldType *)GetTyp())->DoubleToString(sValue, GetValue(), nFmt); - pFormatter->GetOutputString(sValue, nFmt, sFormattedValue, &pCol); + OUString sTempOut(sFormattedValue); + OUString sTempIn(sValue); + pFormatter->GetOutputString(sTempIn, nFmt, sTempOut, &pCol); + sFormattedValue = sTempOut; } else + { pFormatter->GetOutputString(GetValue(), nFmt, sFormattedValue, &pCol); - + } return sFormattedValue; } else |