[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source

[Markus Mohrhard]

 sc/source/filter/oox/condformatcontext.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 098e9e07df1069b73f281aefeee46cfd681f2ae6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Feb 18 02:30:11 2017 +0100

    fix conditional format import from XLSB, tdf#105486
    
    Change-Id: I2b781f45221e434c8ec0ee079afb54c505faf2b5
    Reviewed-on: https://gerrit.libreoffice.org/34396
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit aaea9beabcdfa16ffd36116591c5ebea25906b94)
    Reviewed-on: https://gerrit.libreoffice.org/35197
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx
index 638e5be..1315311 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;
     }
 }