summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-02-18 02:30:11 +0100
committerEike Rathke <erack@redhat.com>2017-03-15 11:40:35 +0000
commit098e9e07df1069b73f281aefeee46cfd681f2ae6 (patch)
treec5b5eac2e182672607576b04051210d12f58fded
parenta5a2c9c83da3a3cc01a9262d6c659c99ad58b152 (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/35197 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
-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 638e5bedcee7..131531181123 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;
}
}