summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-06-30 09:25:07 +0200
committerAndrzej Hunt <andrzej@ahunt.org>2015-10-20 18:18:43 +0200
commita6576c9a03046b4589b429f718e46a27514c4606 (patch)
tree7a378433bbc65fe2615b58a3769a2950c38e5e79
parenteafdfe0725b156a9f5ace821f5a0d7299d811025 (diff)
fix crash when converting units
Change-Id: Ic883e13b5c6923c31e65a887597f0910807dc94d
-rw-r--r--sc/source/core/units/unitsimpl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/units/unitsimpl.cxx b/sc/source/core/units/unitsimpl.cxx
index 7d16ae32042a..4f0057cb7455 100644
--- a/sc/source/core/units/unitsimpl.cxx
+++ b/sc/source/core/units/unitsimpl.cxx
@@ -780,7 +780,7 @@ bool UnitsImpl::convertCellUnitsForColumnRange(const ScRange& rRange,
}
}
- bool bLocalAnnotationRequired = (!rRange.In(*aHeader.address)) &&
+ bool bLocalAnnotationRequired = (aHeader.address && !rRange.In(*aHeader.address)) &&
(rOutputUnit != aHeader.unit);
double nValue = pDoc->GetValue(aCurrent);