diff options
| author | Benjamin Ni <benjaminniri@hotmail.com> | 2015-07-03 16:45:52 +0100 |
|---|---|---|
| committer | Andrzej Hunt <andrzej@ahunt.org> | 2015-10-20 18:18:44 +0200 |
| commit | ff257403fed69615080515a68c41e7c8f697f456 (patch) | |
| tree | a5d3db21430a990ea565d28a2d558690057e8cdb | |
| parent | 67c4c1c5b2a0183b0fb05222096193c7abd146b3 (diff) | |
tdf#92455 - inconsistent unit handling
Change-Id: Ifbb85a32ef9d84199d17cedd28fa0f9e66eabf66
| -rw-r--r-- | sc/source/core/units/unitsimpl.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/core/units/unitsimpl.cxx b/sc/source/core/units/unitsimpl.cxx index c2e39f97fd96..0c8920164b95 100644 --- a/sc/source/core/units/unitsimpl.cxx +++ b/sc/source/core/units/unitsimpl.cxx @@ -789,8 +789,9 @@ bool UnitsImpl::convertCellUnitsForColumnRange(const ScRange& rRange, } } - bool bLocalAnnotationRequired = (aHeader.address && !rRange.In(*aHeader.address)) && - (rOutputUnit != aHeader.unit); + bool bLocalAnnotationRequired = !aHeader.address || ( + !rRange.In(*aHeader.address) && + (rOutputUnit != aHeader.unit) ); double nValue = pDoc->GetValue(aCurrent); if (!aLocalUnit.areConvertibleTo(rOutputUnit)) |