From 889dc7bffa02236bf2ad56b382997771f0fcf3c6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 15 Aug 2019 15:56:55 +0200 Subject: use more TOOLS_WARN_EXCEPTION Change-Id: Ic21ea11ff106e0732bb8fa600ef39a549d7bda86 Reviewed-on: https://gerrit.libreoffice.org/77569 Tested-by: Jenkins Reviewed-by: Noel Grandin --- oox/source/ole/axcontrol.cxx | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'oox/source/ole') diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 5adc2e69dba1..57606fa1ce0b 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -180,8 +180,7 @@ bool lclExtractRangeFromName( CellRangeAddress& orRangeAddr, const Reference< XM } catch (const Exception&) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("oox", exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("oox", ""); } return false; } @@ -214,8 +213,7 @@ void lclPrepareConverter( PropertySet& rConverter, const Reference< XModel >& rx } catch (const Exception&) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("oox", exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("oox", ""); } rConverter.setProperty( PROP_XLA1Representation, rAddressString ); rConverter.setProperty( PROP_ReferenceSheet, nRefSheet ); @@ -359,8 +357,7 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo } catch (const Exception&) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("oox", exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("oox", ""); } // list entry source @@ -2748,8 +2745,7 @@ Reference< XControlModel > EmbeddedForm::convertAndInsert( const EmbeddedControl } catch (const Exception&) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("oox", "exception creating Control: " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("oox", "exception creating Control"); } return xRet; } @@ -2775,8 +2771,7 @@ Reference< XIndexContainer > const & EmbeddedForm::createXForm() } catch (const Exception&) { - css::uno::Any ex( cppu::getCaughtException() ); - SAL_WARN("oox", "exception creating Form: " << exceptionToString(ex)); + TOOLS_WARN_EXCEPTION("oox", "exception creating Form"); } // always clear the forms supplier to not try to create the form again mxFormsSupp.clear(); -- cgit