summaryrefslogtreecommitdiff
path: root/dbaccess/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-10 14:40:07 +0000
committerMichael Stahl <mstahl@redhat.com>2017-01-11 11:32:35 +0000
commit88035917f52d7c372dc757ecd44978cce2681291 (patch)
treebf403a7407780d6d7868516be2d783b54a4f5aec /dbaccess/source
parentd4034a461f1e6e22adc26ce2a3c84916f85abeaa (diff)
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@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'dbaccess/source')
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 98a3312919be..cac82ba92d9a 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)
{