summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-05-28 21:39:45 +0100
committerNoel Power <noel.power@suse.com>2013-05-28 21:41:55 +0100
commitb74f9bdb407ed56942ee041bc4af3edff0126595 (patch)
treebf57482d348cd8145e6ff5f9a67aa309cfdd72e5 /sc
parentbf087c85aab791a9282bbda940344c8bf9925ef4 (diff)
oops forgot to use the mbReadyForFinalize flag in CondFormat::finalizeImport()
Change-Id: I4606b4b1e26303ebba501276a176b2fb66bf9e37 (cherry picked from commit 353e4d00f5a1226146466ed93c99e911c268d650)
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/oox/condformatbuffer.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 70a8b65279f9..b7cbb862c0bf 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;