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

[Michael Meeks]

 sc/source/core/data/column2.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 284c6681688f7075900d2351976c3611702411ce
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat Jul 5 22:13:44 2014 +0100

    fdo#80813 - avoid FMR by re-fetch pattern after a potential re-calculation.
    
    Change-Id: Ib197f4cd74cd2c444a5f7c207fe2e5be14eea65d
    Reviewed-on: https://gerrit.libreoffice.org/10095
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 18aee24..63c5e0f 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -131,11 +131,15 @@ long ScColumn::GetNeededSize(
             return 0;
     }
 
-    //      conditional formatting
+    // conditional formatting
     const SfxItemSet* pCondSet = pDocument->GetCondResult( nCol, nRow, nTab );
 
-    //  line break?
+    // fdo#80813 - fetching conditional result (GetCondResult) above can cause
+    // a re-calculate which can delete and re-set the pattern we fetched.
+    if (!rOptions.pPattern)
+        pPattern = pAttrArray->GetPattern( nRow );
 
+    //  line break?
     const SfxPoolItem* pCondItem;
     SvxCellHorJustify eHorJust;
     if (pCondSet &&