diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-26 18:23:31 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-27 23:00:05 -0600 |
| commit | 6922a0b190e3877cfae1ca08bfe86e0a010e9d86 (patch) | |
| tree | 929fd9d81cfe0d140cecb316c005cf95d171a368 /sc | |
| parent | 0860d2bca15536e1277a136c8d1390c5fa3bd271 (diff) | |
String => OUString in svl numfmuno + clean-up legacy of GetPreviewString
Change-Id: I20f080b76b864208f0706bef9e87cb299f3845aa
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 3ff768e41d6e..1ebb83a1cf6a 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -7608,7 +7608,7 @@ void ScInterpreter::ScCurrency() sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { - String aStr; + OUString aStr; double fDec; if (nParamCount == 2) { @@ -7639,7 +7639,7 @@ void ScInterpreter::ScCurrency() ScGlobal::eLnge); if ( (sal_uInt16) fDec != pFormatter->GetFormatPrecision( nIndex ) ) { - String sFormatString = pFormatter->GenerateFormat( + OUString sFormatString = pFormatter->GenerateFormat( nIndex, ScGlobal::eLnge, true, // mit Tausenderpunkt @@ -7647,10 +7647,10 @@ void ScInterpreter::ScCurrency() (sal_uInt16) fDec,// Nachkommastellen 1); // 1 Vorkommanull if (!pFormatter->GetPreviewString(sFormatString, - fVal, - aStr, - &pColor, - ScGlobal::eLnge)) + fVal, + aStr, + &pColor, + ScGlobal::eLnge)) SetError(errIllegalArgument); } else @@ -7698,7 +7698,7 @@ void ScInterpreter::ScFixed() sal_uInt8 nParamCount = GetByte(); if ( MustHaveParamCount( nParamCount, 1, 3 ) ) { - String aStr; + OUString aStr; double fDec; bool bThousand; if (nParamCount == 3) @@ -7732,7 +7732,7 @@ void ScInterpreter::ScFixed() sal_uLong nIndex = pFormatter->GetStandardFormat( NUMBERFORMAT_NUMBER, ScGlobal::eLnge); - String sFormatString = pFormatter->GenerateFormat( + OUString sFormatString = pFormatter->GenerateFormat( nIndex, ScGlobal::eLnge, bThousand, // mit Tausenderpunkt @@ -7907,8 +7907,8 @@ void ScInterpreter::ScText() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScText" ); if ( MustHaveParamCount( GetByte(), 2 ) ) { - String sFormatString = GetString(); - String aStr; + OUString sFormatString = GetString(); + OUString aStr; bool bString = false; double fVal = 0.0; switch (GetStackType()) @@ -7946,7 +7946,7 @@ void ScInterpreter::ScText() PushError( nGlobalError); else { - String aResult; + OUString aResult; Color* pColor = NULL; LanguageType eCellLang; const ScPatternAttr* pPattern = pDok->GetPattern( |