diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-05 16:25:03 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-07 20:00:16 +0000 |
| commit | 009851223b5ced4ed2662af2e2ae81c0f9200e45 (patch) | |
| tree | a8ab339589ea23b98513d394eabc4f135e69ccae /svtools | |
| parent | 35b42a9d1282a92dbc9a7fbc51d279812070688c (diff) | |
module svl: all String and some bool and related clean-up
Change-Id: I36eb559fa58dbe75384b7119c788af0048813aed
Reviewed-on: https://gerrit.libreoffice.org/4733
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/fmtfield.cxx | 9 | ||||
| -rw-r--r-- | svtools/source/svhtml/htmlout.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/unoiface.cxx | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 7e04e8ca54ec..bc6bd449ae1e 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -958,18 +958,15 @@ void FormattedField::ImplSetValue(double dVal, sal_Bool bForce) m_bValueDirty = sal_False; m_dCurrentValue = dVal; - String sNewText; + OUString sNewText; if (ImplGetFormatter()->IsTextFormat(m_nFormatKey)) { // zuerst die Zahl als String im Standard-Format - String sTemp; + OUString sTemp; ImplGetFormatter()->GetOutputString(dVal, 0, sTemp, &m_pLastOutputColor); // dann den String entsprechend dem Text-Format { - OUString sTempIn(sTemp); - OUString sTempOut; - ImplGetFormatter()->GetOutputString(sTempIn, m_nFormatKey, sTempOut, &m_pLastOutputColor); - sNewText = sTempOut; + ImplGetFormatter()->GetOutputString(sTemp, m_nFormatKey, sNewText, &m_pLastOutputColor); } } else diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index a126e4ea79f5..a23638f122da 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -940,7 +940,7 @@ OString HTMLOutFuncs::CreateTableDataOptionsValNum( if ( bValue ) { // printf / scanf ist zu ungenau - String aValStr; + OUString aValStr; rFormatter.GetInputLineString( fVal, 0, aValStr ); OString sTmp(OUStringToOString(aValStr, eDestEnc)); aStrTD.append(' '). diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index fd7d5b3200a0..bc434ae10003 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -1051,9 +1051,9 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com: Color* pDum; double d = 0.0; rValue >>= d; - String sConverted; + OUString sConverted; pFormatter->GetOutputString(d, 0, sConverted, &pDum); - aReturn <<= OUString( sConverted ); + aReturn <<= sConverted; } break; case ::com::sun::star::uno::TypeClass_STRING: |