[Libreoffice-commits] core.git: sc/source

[Jochen Nitschke]

 sc/source/core/data/table4.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 3a6e3d7811ceff077d4dd3f5f77b7e88cb223e00
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Apr 24 00:05:16 2016 +0200

    remove comment about old compiler issue
    
    left change in place as it improves readability
    original commit was 59433cfbff6eba5a13051945f34b827ddc66917e
    move scope of variable
    
    Change-Id: I86f7a7c741556d75079bd4cb3cfecafcdd229d24
    Reviewed-on: https://gerrit.libreoffice.org/24325
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 1f6d896d6..27e5705 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1364,12 +1364,7 @@ void ScTable::FillAutoSimple(
                 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.
                         sal_Int32 nNextValue = nStringValue+(sal_Int32)nDelta;
-
-                        OUString aStr;
                         if ( nHeadNoneTail < 0 )
                         {
                             setSuffixCell(
@@ -1379,7 +1374,8 @@ void ScTable::FillAutoSimple(
                         }
                         else
                         {
-                            aStr = aValue + lcl_ValueString( nNextValue, nCellDigits );
+                            OUString aStr = aValue + lcl_ValueString(nNextValue,
+                                                                     nCellDigits );
                             aCol[rCol].SetRawString(rRow, aStr);
                         }
                     }