diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-18 21:05:45 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-18 21:05:45 -0600 |
commit | 30fa6e86a5bc4e8553f353ecbc17d4ae67874c9b (patch) | |
tree | 92b88acc6d2014127f04b0d7bff7718edb7a6414 /sc/source | |
parent | 731ba0ef925f2005ec54e856e0bc3c54a3874707 (diff) |
WaE : shadow variable
Change-Id: I394817653afa738e7e3d19a1d82f892fb3b35c19
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/ui/view/output2.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 7146cd21d961..ac6365c37b8b 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -626,15 +626,16 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth ) long nMaxDigit = GetMaxDigitWidth(); sal_uInt16 nNumDigits = static_cast<sal_uInt16>(nWidth / nMaxDigit); - OUString sTempOut(aString); - if (!pNumFormat->GetOutputString(fVal, nNumDigits, sTempOut)) { + OUString sTempOut(aString); + if (!pNumFormat->GetOutputString(fVal, nNumDigits, sTempOut)) + { + aString = sTempOut; + // Failed to get output string. Bail out. + return; + } aString = sTempOut; - // Failed to get output string. Bail out. - return; } - aString = sTempOut; - sal_uInt8 nSignCount = 0, nDecimalCount = 0, nExpCount = 0; xub_StrLen nLen = aString.Len(); sal_Unicode cDecSep = ScGlobal::GetpLocaleData()->getLocaleItem().decimalSeparator.getStr()[0]; |