From 44f72ca3747deb1c8824626f216d295815b5ceff Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Thu, 14 Jun 2018 23:49:11 +0200 Subject: tdf#118022: fix crash when searching record in form by handling SQLException See https://bugs.documentfoundation.org/attachment.cgi?id=142760 Found thanks on gdb with command catch throw com::sun::star::sdbc::SQLException First SQLException was dealt but not the second one Reviewed-on: https://gerrit.libreoffice.org/55836 (cherry picked from commit f94292e8c4d469bd3123e1649b0f2a94d4b357b3) Change-Id: I7d5d3ad612db132a3bda97cff14367912ae885f9 Reviewed-on: https://gerrit.libreoffice.org/55853 Tested-by: Jenkins Reviewed-by: Christian Lohmaier --- svx/source/fmcomp/gridcell.cxx | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'svx/source/fmcomp/gridcell.cxx') diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 7da52af19012..2da40fa9b03c 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1150,10 +1150,22 @@ void DbTextField::PaintFieldToCell( OutputDevice& _rDev, const tools::Rectangle& OUString DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/) { + if (!_rxField.is()) + return OUString(); + const css::uno::Reference xPS(_rxField, UNO_QUERY); FormattedColumnValue fmter( xFormatter, xPS ); - return fmter.getFormattedValue(); + try + { + return fmter.getFormattedValue(); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + return OUString(); + } -- cgit v1.2.3