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

[Caolán McNamara]

 dbaccess/source/ui/misc/TokenWriter.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 88035917f52d7c372dc757ecd44978cce2681291
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 10 14:40:07 2017 +0000

    Resolves: rhbz#1409634 crash on close storing clipboard of database table
    
    Change-Id: I8e692314b4ef278f7881780d51bcecb60ca80c3f
    (cherry picked from commit 6c2725038b627535ba97ead89dadb96e0ff69c3c)
    Reviewed-on: https://gerrit.libreoffice.org/32929
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 98a3312..cac82ba 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -934,8 +934,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal
     aStrTD = aStrTD + "=";
     aStrTD = aStrTD + pChar;
 
-    Reference< css::util::XNumberFormatsSupplier >  xSupplier = m_xFormatter->getNumberFormatsSupplier();
-    SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier );
+    SvNumberFormatsSupplierObj* pSupplierImpl = m_xFormatter.is() ? SvNumberFormatsSupplierObj::getImplementation(m_xFormatter->getNumberFormatsSupplier()) : nullptr;
     SvNumberFormatter* pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : nullptr;
     if(pFormatter)
     {