diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-29 10:46:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-29 15:02:21 +0200 |
| commit | 9a0d2378baeeb654e81af1871b4933f3a90b27e6 (patch) | |
| tree | faeb5c864b8bbc4c25d07ee632bee4ae8ea74a0e | |
| parent | 1cd17e986038e843e60944e674a4e0e155276f7f (diff) | |
improve scoping
Change-Id: I579ab896f9694e95b10fac35263f9d13779c46e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113305
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/filter/excel/impop.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index b834ecb8ed46..c1cf9a5edbdd 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -923,8 +923,7 @@ void ImportExcel::Cellmerging() XclImpAddressConverter& rAddrConv = GetAddressConverter(); SCTAB nScTab = GetCurrScTab(); - sal_uInt16 nCount; - nCount = maStrm.ReaduInt16(); + sal_uInt16 nCount = maStrm.ReaduInt16(); for( sal_uInt16 nIdx = 0; (nIdx < nCount) && (maStrm.GetRecLeft() >= 8); ++nIdx ) { XclRange aXclRange; diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 09c8a0b4b034..dd82a0c2f67c 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -4241,9 +4241,8 @@ void XclImpSheetDrawing::OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) void XclImpSheetDrawing::ReadNote3( XclImpStream& rStrm ) { XclAddress aXclPos; - sal_uInt16 nTotalLen; rStrm >> aXclPos; - nTotalLen = rStrm.ReaduInt16(); + sal_uInt16 nTotalLen = rStrm.ReaduInt16(); ScAddress aScNotePos( ScAddress::UNINITIALIZED ); if( !GetAddressConverter().ConvertAddress( aScNotePos, aXclPos, maScUsedArea.aStart.Tab(), true ) ) |