[Libreoffice-commits] core.git: sc/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue Apr 6 15:33:13 UTC 2021
sc/source/filter/excel/impop.cxx | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit b6fa0c15af7ea06a71d65e03204376fce7766ee9
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Apr 6 11:39:48 2021 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Apr 6 17:32:28 2021 +0200
improve scoping
Change-Id: Ifb34ca678e019ded44af98b18a72f81206168b8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113672
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
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 ) )
More information about the Libreoffice-commits
mailing list