diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-17 12:22:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-17 13:59:40 +0100 |
| commit | 5a69d3afc74d26f325d9f78839e9b36b956aae15 (patch) | |
| tree | 8417455d387134cee5ea59b76bf9e84ff2a4ae26 /sc | |
| parent | da69c7633a486651f9f4fd4cfd08f167881e0bd6 (diff) | |
coverity#736887 Unintended sign extension
also
coverity#736888
coverity#736889
coverity#736890
Change-Id: I3e0d11d12c7da17297ba827f8125b9d99680121b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/excform.cxx | 11 | ||||
| -rw-r--r-- | sc/source/filter/excel/excform8.cxx | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index ee3d1eb0c2ad..ccc38e574dc3 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -975,8 +975,8 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal break; case 0x19: // Special Attribute [327 279] { - sal_uInt16 nData, nFakt; - sal_uInt8 nOpt; + sal_uInt16 nData(0), nFakt(0); + sal_uInt8 nOpt(0); aIn >> nOpt; @@ -992,9 +992,10 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal } if( nOpt & 0x04 ) - {// nFakt -> skip bytes or words AttrChoose - nData++; - aIn.Ignore( nData * nFakt ); + { + // nFakt -> skip bytes or words AttrChoose + ++nData; + aIn.Ignore(static_cast<sal_Size>(nData) * nFakt); } } break; diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 09652d231a9f..a056dc121f6b 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -993,16 +993,17 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa break; case 0x19: // Special Attribute [327 279] { - sal_uInt16 nData, nFakt; - sal_uInt8 nOpt; + sal_uInt16 nData(0), nFakt(0); + sal_uInt8 nOpt(0); aIn >> nOpt >> nData; nFakt = 2; if( nOpt & 0x04 ) - {// nFakt -> skip bytes or words AttrChoose - nData++; - aIn.Ignore( nData * nFakt ); + { + // nFakt -> skip bytes or words AttrChoose + ++nData; + aIn.Ignore(static_cast<sal_Size>(nData) * nFakt); } } break; |