[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Kohei Yoshida]

 sc/source/core/data/dociter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit adb85f81cec5783a3a70045731401f73aa76d6f4
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Feb 7 11:52:16 2014 -0500

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 0fd07c7..d93ee06 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.