[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source

[Arul Michael]

 sc/source/core/data/column2.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 7a9a28857a4da8d2353c88ce90d8a60030d89e48
Author: Arul Michael <arul71.m at gmail.com>
Date:   Thu Mar 31 17:17:58 2016 +0530

    tdf#92963 Pasting a whole row with data crashes all open LibO apps
    
     In ScColumn::GetNeededSize the memory pointed by rOptions.pPattern is freed and
    new value is set again in ScFormulaCell::InterpretTail function in pDocument->SetNumberFormat
    when pDocument->GetCondResult is called in column2.cxx:130.For fix setting the newly calculated
    ScPatternAttr* value after the GetCondResult call.
    
    Change-Id: I045404465b6dfa561b0821bb3b1875463aa7887a
    Reviewed-on: https://gerrit.libreoffice.org/23688
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 99bf0b931401f556033f67297aa9783c4cf19b00)
    Reviewed-on: https://gerrit.libreoffice.org/23708

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 01dde57..8c15aae 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -129,6 +129,13 @@ long ScColumn::GetNeededSize(
     //      conditional formatting
     const SfxItemSet* pCondSet = pDocument->GetCondResult( nCol, nRow, nTab );
 
+    //The pPattern may change in GetCondResult
+    if (aCell.meType == CELLTYPE_FORMULA)
+    {
+        pPattern = pAttrArray->GetPattern( nRow );
+        if (ppPatternChange)
+            *ppPatternChange = pPattern;
+    }
     //  line break?
 
     const SfxPoolItem* pCondItem;