[Libreoffice-commits] core.git: sc/source

[Caolán McNamara]

 sc/source/ui/unoobj/chart2uno.cxx |   41 ++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

New commits:
commit deed6dcacd355ce84cada955887a31e7d8cb5fb1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 8 12:57:07 2014 +0100

    Resolves: fdo#48405 GetString can call a macro which modifies the document
    
    causing m_aDataArray to be cleared, so the rItem the result of GetString
    is being assigned to is invalid
    
    Change-Id: I1dc30d675233ddc53234bdb5349c5f374b036ca8

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 9283ffe..b8a62ab 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2608,18 +2608,16 @@ void ScChart2DataSequence::BuildDataCache()
                                 continue;
                         }
 
-                        m_aDataArray.push_back(Item());
-                        Item& rItem = m_aDataArray.back();
-                        ++nDataCount;
+                        Item aItem;
 
                         ScAddress aAdr(nCol, nRow, nTab);
-                        rItem.maString = m_pDocument->GetString(aAdr);
+                        aItem.maString = m_pDocument->GetString(aAdr);
 
                         switch (m_pDocument->GetCellType(aAdr))
                         {
                             case CELLTYPE_VALUE:
-                                rItem.mfValue = m_pDocument->GetValue(aAdr);
-                                rItem.mbIsValue = true;
+                                aItem.mfValue = m_pDocument->GetValue(aAdr);
+                                aItem.mbIsValue = true;
                             break;
                             case CELLTYPE_FORMULA:
                             {
@@ -2632,8 +2630,8 @@ void ScChart2DataSequence::BuildDataCache()
 
                                 if (pFCell->IsValue())
                                 {
-                                    rItem.mfValue = pFCell->GetValue();
-                                    rItem.mbIsValue = true;
+                                    aItem.mfValue = pFCell->GetValue();
+                                    aItem.mbIsValue = true;
                                 }
                             }
                             break;
@@ -2643,6 +2641,9 @@ void ScChart2DataSequence::BuildDataCache()
                             default:
                                 ; // do nothing
                         }
+
+                        m_aDataArray.push_back(aItem);
+                        ++nDataCount;
                     }
                 }
             }
@@ -2714,17 +2715,15 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef& pToke
             {
                 if (pMat->IsValue(nC, nR) || pMat->IsBoolean(nC, nR))
                 {
-                    m_aDataArray.push_back(Item());
-                    Item& rItem = m_aDataArray.back();
-                    ++nDataCount;
+                    Item aItem;
 
-                    rItem.mbIsValue = true;
-                    rItem.mfValue = pMat->GetDouble(nC, nR);
+                    aItem.mbIsValue = true;
+                    aItem.mfValue = pMat->GetDouble(nC, nR);
 
                     SvNumberFormatter* pFormatter = m_pDocument->GetFormatTable();
                     if (pFormatter)
                     {
-                        const double fVal = rItem.mfValue;
+                        const double fVal = aItem.mfValue;
                         Color* pColor = NULL;
                         sal_uInt32 nFmt = 0;
                         if (pTable)
@@ -2734,17 +2733,21 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef& pToke
                             SCROW nRow = aRange.aStart.Row() + static_cast<SCROW>(nR);
                             pTable->getCell(nCol, nRow, &nFmt);
                         }
-                        pFormatter->GetOutputString(fVal, nFmt, rItem.maString, &pColor);
+                        pFormatter->GetOutputString(fVal, nFmt, aItem.maString, &pColor);
                     }
+
+                    m_aDataArray.push_back(aItem);
+                    ++nDataCount;
                 }
                 else if (pMat->IsString(nC, nR))
                 {
+                    Item aItem;
+
+                    aItem.mbIsValue = false;
+                    aItem.maString = pMat->GetString(nC, nR).getString();
+
                     m_aDataArray.push_back(Item());
-                    Item& rItem = m_aDataArray.back();
                     ++nDataCount;
-
-                    rItem.mbIsValue = false;
-                    rItem.maString = pMat->GetString(nC, nR).getString();
                 }
             }
         }