summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-02-07 11:52:16 -0500
committerCaolán McNamara <caolanm@redhat.com>2014-02-07 17:00:15 +0000
commitadb85f81cec5783a3a70045731401f73aa76d6f4 (patch)
treeb5fb04c423a6fe39f848445d646ec933d5945910
parent5e161e9ee63377679fc57f33a216ca4707276700 (diff)
fdo#74507: Ensure that we have non-null pointer to ScColumn.
Else it would cause a null pointer dereferencing when "precision as shown" option is set. Change-Id: Ie8d2fdb916b575fff7e0217c45c18a2c799577cb (cherry picked from commit 738bd2cfd446debbc0e08fb5500004276fa28c7d) Reviewed-on: https://gerrit.libreoffice.org/7927 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/core/data/dociter.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 0fd07c716608..d93ee06a8251 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -165,7 +165,7 @@ bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr)
bNextColumn = true;
}
- ScColumn* pCol = NULL;
+ ScColumn* pCol = &(pDoc->maTabs[mnTab])->aCol[mnCol];
if (bNextColumn)
{
// Find the next available column.