summaryrefslogtreecommitdiff
path: root/xmloff/source/chart
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/chart')
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx6
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx28
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx7
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx12
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx10
-rw-r--r--xmloff/source/chart/SchXMLSeriesHelper.cxx6
-rw-r--r--xmloff/source/chart/SchXMLTools.cxx6
7 files changed, 33 insertions, 42 deletions
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 596f9e580b50..f7fb5d06ba97 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -166,8 +166,7 @@ void lcl_removeEmptyChartTypeGroups( const uno::Reference< chart2::XChartDocumen
}
catch(const uno::Exception& ex)
{
- OString aBStr(OUStringToOString(ex.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "Exception caught while removing empty chart types: " << aBStr);
+ SAL_INFO("xmloff.chart", "Exception caught while removing empty chart types: " << ex);
}
}
@@ -303,8 +302,7 @@ void lcl_setDataProvider(uno::Reference<chart2::XChartDocument> const & xChartDo
}
catch (const uno::Exception & rEx)
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "SchXMLChartContext::StartElement(): Exception caught: " << aBStr);
+ SAL_INFO("xmloff.chart", "SchXMLChartContext::StartElement(): Exception caught: " << rEx);
}
}
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 41d0716f6b4d..e0975a8d801c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -346,7 +346,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. " << ex);
}
return xResult;
@@ -453,7 +453,7 @@ bool lcl_isSeriesAttachedToFirstAxis(
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex);
}
return bResult;
@@ -876,7 +876,7 @@ lcl_TableData lcl_getDataForLocalTable(
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "something went wrong during table data collection: " << rEx.Message);
+ SAL_INFO("xmloff.chart", "something went wrong during table data collection: " << rEx);
}
return aResult;
@@ -922,8 +922,7 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "chart:exporting error bar ranges: " << aBStr );
+ SAL_INFO("xmloff.chart", "chart:exporting error bar ranges: " << rEx );
}
}
@@ -1465,7 +1464,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "AdditionalShapes not found: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "AdditionalShapes not found: " << rEx );
}
if( mxAdditionalShapes.is())
@@ -1914,8 +1913,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "chart:exportPlotAreaException caught: " << aBStr);
+ SAL_INFO("xmloff.chart", "chart:exportPlotAreaException caught: " << rEx);
}
}
@@ -2624,7 +2622,7 @@ void SchXMLExportHelper_Impl::exportSeries(
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Series not found or no XPropertySet: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Series not found or no XPropertySet: " << rEx );
continue;
}
if( xPropSet.is())
@@ -2640,7 +2638,7 @@ void SchXMLExportHelper_Impl::exportSeries(
}
catch( const beans::UnknownPropertyException & rEx )
{
- SAL_INFO("xmloff.chart", "Required property not found in DataRowProperties: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Required property not found in DataRowProperties: " << rEx );
}
const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() );
@@ -2796,7 +2794,7 @@ void SchXMLExportHelper_Impl::exportSeries(
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during Export of series - optional DataMeanValueProperties not available: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during Export of series - optional DataMeanValueProperties not available: " << rEx );
}
if( xStatProp.is() )
@@ -3044,7 +3042,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const Reference<beans::XPropertySe
}
catch( const beans::UnknownPropertyException & rEx )
{
- SAL_INFO("xmloff.chart", "Required property not found in DataRowProperties: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Required property not found in DataRowProperties: " << rEx );
}
if( nErrorBarStyle != chart::ErrorBarStyle::NONE && (bNegative || bPositive))
@@ -3266,7 +3264,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during Export of data point: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during Export of data point: " << rEx );
}
}
else
@@ -3335,7 +3333,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during Export of data point: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during Export of data point: " << rEx );
}
if( xPropSet.is())
{
@@ -3669,7 +3667,7 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference<
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex);
}
}
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 30d1b6506f28..6212112af875 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -406,7 +406,7 @@ void SchXMLImportHelper::DeleteDataSeries(
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. " << ex);
}
}
@@ -484,7 +484,7 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex);
}
return xResult;
}
@@ -600,8 +600,7 @@ void SAL_CALL SchXMLImport::setTargetDocument(const uno::Reference<lang::XCompon
}
catch (const uno::Exception & rEx)
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "SchXMLChartContext::StartElement(): Exception caught: " << aBStr);
+ SAL_INFO("xmloff.chart", "SchXMLChartContext::StartElement(): Exception caught: " << rEx);
}
}
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index b724655f7066..b625331c6db5 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -117,8 +117,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "Exception caught for property NumberOfLines: " << aBStr);
+ SAL_INFO("xmloff.chart", "Exception caught for property NumberOfLines: " << rEx);
}
}
@@ -384,8 +383,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "PlotAreaContext:EndElement(): Exception caught: " << aBStr);
+ SAL_INFO("xmloff.chart", "PlotAreaContext:EndElement(): Exception caught: " << rEx);
}
} // if
@@ -555,8 +553,7 @@ void SchXMLPlotAreaContext::EndElement()
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "Exception caught for property NumberOfLines: " << aBStr);
+ SAL_INFO("xmloff.chart", "Exception caught for property NumberOfLines: " << rEx);
}
}
@@ -571,8 +568,7 @@ void SchXMLPlotAreaContext::EndElement()
}
catch( const uno::Exception & rEx )
{
- OString aBStr(OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
- SAL_INFO("xmloff.chart", "Exception caught for property Volume: " << aBStr);
+ SAL_INFO("xmloff.chart", "Exception caught for property Volume: " << rEx);
}
}
}
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 5aa8eec6e80a..e5552cbe301d 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -469,7 +469,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name()) << ", Message: " << ex.Message);
+ SAL_WARN("xmloff.chart", "Exception caught. " << ex);
}
//init mbSymbolSizeIsMissingInFile:
@@ -859,7 +859,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx );
}
}
}
@@ -930,7 +930,7 @@ void SchXMLSeries2Context::setStylesToRegressionCurves(
}
catch( const uno::Exception& rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx );
}
}
@@ -1001,7 +1001,7 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during setting styles to series: " << rEx );
}
}
}
@@ -1097,7 +1097,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught during setting styles to data points: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught during setting styles to data points: " << rEx );
}
}
} // styles iterator
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 3f5173d308c5..7ead41dfb260 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -61,7 +61,7 @@ using ::com::sun::star::uno::Sequence;
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name() ) << ", Message: " << ex.Message );
+ SAL_WARN("xmloff.chart", "Exception caught. Type: " << OUString::createFromAscii( typeid( ex ).name() ) << ", Message: " << ex );
}
return aResult;
@@ -192,7 +192,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesProp
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught SchXMLSeriesHelper::createOldAPISeriesPropertySet: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught SchXMLSeriesHelper::createOldAPISeriesPropertySet: " << rEx );
}
}
@@ -227,7 +227,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP
}
catch( const uno::Exception & rEx )
{
- SAL_INFO("xmloff.chart", "Exception caught SchXMLSeriesHelper::createOldAPIDataPointPropertySet: " << rEx.Message );
+ SAL_INFO("xmloff.chart", "Exception caught SchXMLSeriesHelper::createOldAPIDataPointPropertySet: " << rEx );
}
}
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 6d3dc3e99081..003a6f6f3fb7 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -507,7 +507,7 @@ void CreateCategories(
}
catch( const lang::IllegalArgumentException & ex )
{
- SAL_WARN("xmloff.chart", "IllegalArgumentException caught, Message: " << ex.Message );
+ SAL_WARN("xmloff.chart", "IllegalArgumentException caught, Message: " << ex );
}
aData.Categories.set( xLabeledSeq );
if( pLSequencesPerIndex )
@@ -646,7 +646,7 @@ void setXMLRangePropertyAtDataSequence(
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught, Message: " << ex.Message );
+ SAL_WARN("xmloff.chart", "Exception caught, Message: " << ex );
}
}
@@ -673,7 +673,7 @@ bool getXMLRangePropertyFromDataSequence(
}
catch( const uno::Exception & ex )
{
- SAL_WARN("xmloff.chart", "Exception caught, Message: " << ex.Message );
+ SAL_WARN("xmloff.chart", "Exception caught, Message: " << ex );
}
}
return bResult;