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

[Noel Power]

 sc/source/filter/oox/condformatbuffer.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b74f9bdb407ed56942ee041bc4af3edff0126595
Author: Noel Power <noel.power at suse.com>
Date:   Tue May 28 21:39:45 2013 +0100

    oops forgot to use the mbReadyForFinalize flag in CondFormat::finalizeImport()
    
    Change-Id: I4606b4b1e26303ebba501276a176b2fb66bf9e37
    (cherry picked from commit 353e4d00f5a1226146466ed93c99e911c268d650)

diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 70a8b65..b7cbb86 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -970,6 +970,9 @@ void CondFormat::importCfRule( SequenceInputStream& rStrm )
 
 void CondFormat::finalizeImport()
 {
+    // probably some error in the xml if we are not ready
+    if ( !mbReadyForFinalize )
+        return;
     ScDocument& rDoc = getScDocument();
     maRules.forEachMem( &CondFormatRule::finalizeImport );
     SCTAB nTab = maModel.maRanges.getBaseAddress().Sheet;