summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-02-18 02:30:11 +0100
committerAndras Timar <andras.timar@collabora.com>2017-03-16 14:43:58 +0100
commit93799357162ed23ff2d0c44412c442911228358c (patch)
treea24863156e3b389aca31f09b2c580edb7f0a67fd /sc
parent6db24ee070bbf0b4290ad31d313e0a32ee7e35b5 (diff)
fix conditional format import from XLSB, tdf#105486
Change-Id: I2b781f45221e434c8ec0ee079afb54c505faf2b5 Reviewed-on: https://gerrit.libreoffice.org/34396 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit aaea9beabcdfa16ffd36116591c5ebea25906b94) Reviewed-on: https://gerrit.libreoffice.org/35154 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit e237c0109c94da27715c115cecee69d382d6c183)
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/oox/condformatcontext.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx
index 79c92d2a4d07..4a876648a80d 100644
--- a/sc/source/filter/oox/condformatcontext.cxx
+++ b/sc/source/filter/oox/condformatcontext.cxx
@@ -253,7 +253,9 @@ void CondFormatContext::onEndRecord()
{
case BIFF12_ID_CONDFORMATTING:
if( mxCondFmt.get() )
- mxCondFmt->finalizeImport();
+ {
+ mxCondFmt->setReadyForFinalize();
+ }
break;
}
}