diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-10 14:40:07 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-08 11:56:05 +0100 |
| commit | d099663b5d5f622ffa422b89def52096c952bd0d (patch) | |
| tree | 7b4bb0aef67341c916f1a5328957d3a108d53bbd /dbaccess | |
| parent | 65665e501f30bf695282ab4caac349e091f389c5 (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>
(cherry picked from commit 88035917f52d7c372dc757ecd44978cce2681291)
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/misc/TokenWriter.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 1c4b3c596f43..1c7132a5eed3 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -935,8 +935,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) { |