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

[Markus Mohrhard]

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

New commits:
commit e237c0109c94da27715c115cecee69d382d6c183
Author: Markus Mohrhard <markus.mohrh...@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.mohrh...@googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    (cherry picked from commit aaea9beabcdfa16ffd36116591c5ebea25906b94)
    Reviewed-on: https://gerrit.libreoffice.org/35154
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Eike Rathke <er...@redhat.com>

diff --git a/sc/source/filter/oox/condformatcontext.cxx 
b/sc/source/filter/oox/condformatcontext.cxx
index 79c92d2..4a87664 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;
     }
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits