From b6fa0c15af7ea06a71d65e03204376fce7766ee9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 6 Apr 2021 11:39:48 +0100 Subject: improve scoping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifb34ca678e019ded44af98b18a72f81206168b8f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113672 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- sc/source/filter/excel/impop.cxx | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index c1cf9a5edbdd..91a3605199ad 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -859,15 +859,12 @@ void ImportExcel::Shrfmla() void ImportExcel::Mulrk() { XclAddress aXclPos; - sal_uInt16 nXF; - sal_Int32 nRkNum; - aIn >> aXclPos; for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <= aCurrXclPos.mnCol) && (aIn.GetRecLeft() > 2); ++aCurrXclPos.mnCol ) { - nXF = aIn.ReaduInt16(); - nRkNum = aIn.ReadInt32(); + sal_uInt16 nXF = aIn.ReaduInt16(); + sal_Int32 nRkNum = aIn.ReadInt32(); ScAddress aScPos( ScAddress::UNINITIALIZED ); if( GetAddressConverter().ConvertAddress( aScPos, aCurrXclPos, GetCurrScTab(), true ) ) @@ -881,13 +878,11 @@ void ImportExcel::Mulrk() void ImportExcel::Mulblank() { XclAddress aXclPos; - sal_uInt16 nXF; - aIn >> aXclPos; for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <= aCurrXclPos.mnCol) && (aIn.GetRecLeft() > 2); ++aCurrXclPos.mnCol ) { - nXF = aIn.ReaduInt16(); + sal_uInt16 nXF = aIn.ReaduInt16(); ScAddress aScPos( ScAddress::UNINITIALIZED ); if( GetAddressConverter().ConvertAddress( aScPos, aCurrXclPos, GetCurrScTab(), true ) ) -- cgit