strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dr37 (1.11.150); FILE MERGED

Browse source 
2005/04/27 18:19:38 nn 1.11.150.1: #i48009# calculate value for lcl_ValueString outside of if-statement
This commit is contained in:
Jens-Heiner Rechtien 2005-09-28 10:33:40 +00:00
parent 0a4f19b27d
commit 59433cfbff
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sc/source/core/data/table4.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: table4.cxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: hr $ $Date: 2005-09-23 14:25:42 $
* last change: $Author: hr $ $Date: 2005-09-28 11:33:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -763,16 +763,21 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
case CELLTYPE_EDIT:
if ( nHeadNoneTail )
{
// #i48009# with the "nStringValue+(long)nDelta" expression within the
// lcl_ValueString calls, gcc 3.4.1 makes wrong optimizations (ok in 3.4.3),
// so nNextValue is now calculated ahead.
long nNextValue = nStringValue+(long)nDelta;
String aStr;
if ( nHeadNoneTail < 0 )
{
aStr = lcl_ValueString( nStringValue+(long)nDelta, nCellDigits );
aStr = lcl_ValueString( nNextValue, nCellDigits );
aStr += aValue;
}
else
{
aStr = aValue;
aStr += lcl_ValueString( nStringValue+(long)nDelta, nCellDigits );
aStr += lcl_ValueString( nNextValue, nCellDigits );
}
aCol[nCol].Insert(static_cast<SCROW>(nRow), new ScStringCell( aStr ) );
}