diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-29 09:09:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-29 12:01:58 +0200 |
| commit | e70460f59056b0a4957b534ab26b5c64eb94926c (patch) | |
| tree | ca92d9c98863919eec09be5e361f1a86ef71fa17 | |
| parent | d14cd26011bcd8c9efc448bbcbd71bb468906177 (diff) | |
revert bits of "loplugin:sequentialassign"
from
commit 0d36b32755ac662299e6a8165e9fa57311b74a2f
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Sun Jul 28 12:03:35 2019 +0200
loplugin:sequentialassign
which were false positives and not meant to be committed
Change-Id: I6f2f185bd3564c9329f5a0c78c9020f3ddb52d34
Reviewed-on: https://gerrit.libreoffice.org/76518
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/svx/sdasitm.hxx | 5 | ||||
| -rw-r--r-- | include/xmloff/nmspmap.hxx | 5 | ||||
| -rw-r--r-- | sc/inc/externalrefmgr.hxx | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 84431a4969c0..e0aeaddab83a 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -88,7 +88,10 @@ inline SdrOnOffItem makeSdrTextWordWrapItem( bool bAuto ) { inline size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustomShapeGeometryItem::PropertyPair &r1 ) const { - return r1.first.hashCode() * 37 + r1.second.hashCode(); + size_t hash = 17; + hash = hash * 37 + r1.first.hashCode(); + hash = hash * 37 + r1.second.hashCode(); + return hash; }; #endif diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx index e6875b1c8a39..234b5e4dda2a 100644 --- a/include/xmloff/nmspmap.hxx +++ b/include/xmloff/nmspmap.hxx @@ -55,7 +55,10 @@ struct QNamePairHash { size_t operator()( const QNamePair &r1 ) const { - return r1.first * 37 + r1.second.hashCode(); + size_t hash = 17; + hash = hash * 37 + r1.first; + hash = hash * 37 + r1.second.hashCode(); + return hash; } }; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index ae6a7f8ab80b..7bd670f7cddd 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -305,7 +305,8 @@ private: { const ScAddress& s = rRange.aStart; const ScAddress& e = rRange.aEnd; - size_t hash = s.Tab(); + size_t hash = 17; + hash = hash * 37 + s.Tab(); hash = hash * 37 + s.Col(); hash = hash * 37 + s.Row(); hash = hash * 37 + e.Tab(); |