summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-08-15 15:56:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-08-16 13:31:26 +0200
commit889dc7bffa02236bf2ad56b382997771f0fcf3c6 (patch)
treee7fc2c8748972bb1ed4acb98fd92ff08a8670f7b /xmloff
parent9a97a26511584f41c3753fa9536e1c4a8dce637a (diff)
use more TOOLS_WARN_EXCEPTION
Change-Id: Ic21ea11ff106e0732bb8fa600ef39a549d7bda86 Reviewed-on: https://gerrit.libreoffice.org/77569 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx3
-rw-r--r--xmloff/source/chart/XMLChartStyleContext.cxx3
-rw-r--r--xmloff/source/core/xmlimp.cxx3
-rw-r--r--xmloff/source/draw/shapeexport.cxx3
-rw-r--r--xmloff/source/table/XMLTableExport.cxx12
-rw-r--r--xmloff/source/table/XMLTableImport.cxx6
6 files changed, 10 insertions, 20 deletions
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 342fd37bdb90..8f50bf322fbe 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -119,8 +119,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe
}
catch( const uno::Exception & )
{
- css::uno::Any ex( cppu::getCaughtException() );
- SAL_INFO("xmloff.chart", "Exception caught for property NumberOfLines: " << exceptionToString(ex));
+ TOOLS_INFO_EXCEPTION("xmloff.chart", "Exception caught for property NumberOfLines");
}
}
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index 43769342a293..51eb6e3100e8 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -103,8 +103,7 @@ void XMLChartStyleContext::FillPropertySet(
}
catch( beans::UnknownPropertyException& )
{
- css::uno::Any ex( cppu::getCaughtException() );
- SAL_WARN( "xmloff", "unknown property exception -> shape style not completely imported for chart style " << exceptionToString(ex) );
+ TOOLS_WARN_EXCEPTION( "xmloff", "unknown property exception -> shape style not completely imported for chart style" );
}
lcl_NumberFormatStyleToProperty( msDataStyleName, "NumberFormat", mrStyles, rPropSet );
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index a8001b591950..4853790606c7 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1978,8 +1978,7 @@ void SvXMLImport::SetXmlId(uno::Reference<uno::XInterface> const & i_xIfc,
}
}
} catch (uno::Exception &) {
- css::uno::Any ex( cppu::getCaughtException() );
- SAL_WARN("xmloff.core","SvXMLImport::SetXmlId: exception " << exceptionToString(ex));
+ TOOLS_WARN_EXCEPTION("xmloff.core","SvXMLImport::SetXmlId");
}
}
}
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 92d8f2358716..4de9defd61be 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -621,8 +621,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
}
catch(const uno::Exception&)
{
- css::uno::Any ex( cppu::getCaughtException() );
- SAL_WARN("xmloff", "XMLShapeExport::exportShape(): exception during hyperlink export " << exceptionToString(ex));
+ TOOLS_WARN_EXCEPTION("xmloff", "XMLShapeExport::exportShape(): exception during hyperlink export");
}
if( xSet.is() )
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 596e94149785..449860ed8656 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -591,8 +591,7 @@ void XMLTableExport::exportTableTemplates()
}
catch(const Exception&)
{
- css::uno::Any ex( cppu::getCaughtException() );
- SAL_WARN("xmloff", "XMLTableExport::exportTableTemplates(), export Writer specific attributes, exception caught! " << exceptionToString(ex));
+ TOOLS_WARN_EXCEPTION("xmloff", "XMLTableExport::exportTableTemplates(), export Writer specific attributes, exception caught!");
}
pElements++;
}
@@ -649,8 +648,7 @@ void XMLTableExport::exportTableTemplates()
}
catch(const Exception&)
{
- css::uno::Any ex( cppu::getCaughtException() );
- SAL_WARN("xmloff", "XMLTableExport::exportTableTemplates(), export Writer specific styles, exception caught!" << exceptionToString(ex));
+ TOOLS_WARN_EXCEPTION("xmloff", "XMLTableExport::exportTableTemplates(), export Writer specific styles, exception caught!");
}
pElements++;
}
@@ -658,14 +656,12 @@ void XMLTableExport::exportTableTemplates()
}
catch(const Exception&)
{
- css::uno::Any ex( cppu::getCaughtException() );
- SAL_WARN("xmloff", "XMLTableExport::exportTableDesigns(), exception caught while exporting a table design! " << exceptionToString(ex));
+ TOOLS_WARN_EXCEPTION("xmloff", "XMLTableExport::exportTableDesigns(), exception caught while exporting a table design!");
}
}
catch(const Exception&)
{
- css::uno::Any ex( cppu::getCaughtException() );
- SAL_WARN("xmloff", "XMLTableExport::exportTableDesigns(), exception caught! " << exceptionToString(ex));
+ TOOLS_WARN_EXCEPTION("xmloff", "XMLTableExport::exportTableDesigns()");
}
}
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 717b13c68afa..de223256b894 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -286,8 +286,7 @@ void XMLTableImport::insertTabletemplate(const OUString& rsStyleName, bool bOver
}
catch (Exception const &)
{
- css::uno::Any ex( cppu::getCaughtException() );
- SAL_WARN("xmloff.table", "XMLTableImport::insertTabletemplate(), exception caught!" << exceptionToString(ex));
+ TOOLS_WARN_EXCEPTION("xmloff.table", "XMLTableImport::insertTabletemplate()");
}
if (xTemplate.is())
@@ -300,8 +299,7 @@ void XMLTableImport::insertTabletemplate(const OUString& rsStyleName, bool bOver
}
catch (Exception&)
{
- css::uno::Any ex( cppu::getCaughtException() );
- SAL_WARN("xmloff.table", "XMLTableImport::insertTabletemplate(), exception caught!" << exceptionToString(ex));
+ TOOLS_WARN_EXCEPTION("xmloff.table", "XMLTableImport::insertTabletemplate()");
}
}