mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE : shadow variable

Browse Source 
Change-Id: I394817653afa738e7e3d19a1d82f892fb3b35c19
This commit is contained in:
Norbert Thiebaud
2012-11-18 21:05:45 -06:00
parent 731ba0ef92
commit 30fa6e86a5
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sc/source/ui/view/output2.cxx
View File

@@ -626,15 +626,16 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth )
long nMaxDigit = GetMaxDigitWidth(); long nMaxDigit = GetMaxDigitWidth();
sal_uInt16 nNumDigits = static_cast<sal_uInt16>(nWidth / nMaxDigit); 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; aString = sTempOut;
// Failed to get output string. Bail out.
return;
} }
aString = sTempOut;
sal_uInt8 nSignCount = 0, nDecimalCount = 0, nExpCount = 0; sal_uInt8 nSignCount = 0, nDecimalCount = 0, nExpCount = 0;
xub_StrLen nLen = aString.Len(); xub_StrLen nLen = aString.Len();
sal_Unicode cDecSep = ScGlobal::GetpLocaleData()->getLocaleItem().decimalSeparator.getStr()[0]; sal_Unicode cDecSep = ScGlobal::GetpLocaleData()->getLocaleItem().decimalSeparator.getStr()[0];