[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

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

New commits:
commit 4bcd9947774c05df6031e3b2228939150aa8c78b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Aug 31 04:29:49 2012 +0200

    handle missing cond format entries more gracefully, related fdo#52340
    
    Change-Id: Id1cf7d99a13c04541e87ad00c5418dd4f766d268
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 9dd2afb..21d9307 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -667,6 +667,12 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO
             if (aOldIdToNewId.find(nId) == aOldIdToNewId.end())
             {
                 ScConditionalFormat* pFormat = pOldCondFormatList->GetFormat(nId);
+                if(!pFormat)
+                {
+                    // may happen in some strange circumstances where cell storage and
+                    // cond format storage are not in sync
+                    continue;
+                }
                 ScConditionalFormat* pNewFormat = pFormat->Clone(pDocument);
                 pNewFormat->SetKey(0);
                 //not in list => create entries in both maps and new format