diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-16 14:05:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-16 15:36:22 +0100 |
| commit | 8def8ca39d28ad34106767d14273b7b7d1b0b882 (patch) | |
| tree | 4cfacf0c6c6821b34341c2ed01cc4bcd260e36d1 /sc/source/filter/oox | |
| parent | 94146d15b2183857378b84cac9f36f8455dd378f (diff) | |
loplugin:buriedassign in sc
Change-Id: I1408fd35a50a95e12895979b797548c89f7f4c74
Reviewed-on: https://gerrit.libreoffice.org/63469
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/filter/oox')
| -rw-r--r-- | sc/source/filter/oox/addressconverter.cxx | 12 | ||||
| -rw-r--r-- | sc/source/filter/oox/pagesettings.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 987cef40c99c..552bd0491d6e 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -101,14 +101,14 @@ bool AddressConverter::parseOoxAddress2d( case STATE_COL: { if( ('a' <= cChar) && (cChar <= 'z') ) - (cChar -= 'a') += 'A'; + cChar = (cChar - 'a') + 'A'; if( ('A' <= cChar) && (cChar <= 'Z') ) { /* Return, if 1-based column index is already 6 characters long (12356631 is column index for column AAAAAA). */ if( ornColumn >= 12356631 ) return false; - (ornColumn *= 26) += (cChar - 'A' + 1); + ornColumn = (ornColumn * 26) + (cChar - 'A' + 1); } else if( ornColumn > 0 ) { @@ -127,7 +127,7 @@ bool AddressConverter::parseOoxAddress2d( // return, if 1-based row is already 9 digits long if( ornRow >= 100000000 ) return false; - (ornRow *= 10) += (cChar - '0'); + ornRow = (ornRow * 10) + (cChar - '0'); } else return false; @@ -156,14 +156,14 @@ bool AddressConverter::parseOoxAddress2d( sal_Int32& ornColumn, sal_Int32& ornRo case STATE_COL: { if( ('a' <= cChar) && (cChar <= 'z') ) - (cChar -= 'a') += 'A'; + cChar = (cChar - 'a') + 'A'; if( ('A' <= cChar) && (cChar <= 'Z') ) { /* Return, if 1-based column index is already 6 characters long (12356631 is column index for column AAAAAA). */ if( ornColumn >= 12356631 ) return false; - (ornColumn *= 26) += (cChar - 'A' + 1); + ornColumn = (ornColumn * 26) + (cChar - 'A' + 1); } else if( ornColumn > 0 ) { @@ -182,7 +182,7 @@ bool AddressConverter::parseOoxAddress2d( sal_Int32& ornColumn, sal_Int32& ornRo // return, if 1-based row is already 9 digits long if( ornRow >= 100000000 ) return false; - (ornRow *= 10) += (cChar - '0'); + ornRow = (ornRow * 10) + (cChar - '0'); } else return false; diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 87297db0797f..bae8c61f6034 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -538,7 +538,7 @@ double HeaderFooterParser::parse( const Reference<sheet::XHeaderFooterContent>& eState = STATE_TEXT; // ignore case of token codes if( ('a' <= cChar) && (cChar <= 'z') ) - (cChar -= 'a') += 'A'; + cChar = (cChar - 'a') + 'A'; switch( cChar ) { case '&': maBuffer.append( cChar ); break; // the '&' character |