summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-29 16:21:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-10-04 15:18:00 +0200
commit2c05d758b2b62c9df413e2514fb3cd233d0f3ec7 (patch)
treee0a23d3da6fb17ae97d18957fc14f4a4a8de2d3f /writerfilter/source/dmapper
parenta3088b1e72ef17babe3d3664c610afd02cfe0891 (diff)
add << operator for css::uno::Exception
Change-Id: Ia23dafd07133779144965682df3b7125a3214235 Reviewed-on: https://gerrit.libreoffice.org/43046 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerfilter/source/dmapper')
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx6
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx20
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx4
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.cxx2
-rw-r--r--writerfilter/source/dmapper/NumberingManager.cxx6
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx4
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx4
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx4
-rw-r--r--writerfilter/source/dmapper/TableManager.cxx2
10 files changed, 29 insertions, 29 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index ab3e53c9d93d..1423263274ab 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -129,7 +129,7 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon
}
catch (const uno::Exception& rException)
{
- SAL_WARN("writerfilter", "DomainMapper::DomainMapper: failed to initialize RDF metadata: " << rException.Message);
+ SAL_WARN("writerfilter", "DomainMapper::DomainMapper: failed to initialize RDF metadata: " << rException);
}
if (eDocumentType == SourceDocumentType::OOXML) {
@@ -146,7 +146,7 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon
}
catch (const uno::Exception& rException)
{
- SAL_WARN("writerfilter", "DomainMapper::DomainMapper: failed to initialize default font: " << rException.Message);
+ SAL_WARN("writerfilter", "DomainMapper::DomainMapper: failed to initialize default font: " << rException);
}
}
@@ -3187,7 +3187,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
}
catch( const uno::RuntimeException& e )
{
- SAL_WARN("writerfilter", "failed. Message :" << e.Message);
+ SAL_WARN("writerfilter", "failed. Message :" << e);
}
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 98faa97b635d..22ba665a8e02 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -938,7 +938,7 @@ bool lcl_emptyRow(std::vector<RowSequence_t>& rTableRanges, sal_Int32 nRow)
}
catch (const lang::IllegalArgumentException& e)
{
- SAL_WARN( "writerfilter.dmapper", "compareRegionStarts() failed: " << e.Message);
+ SAL_WARN( "writerfilter.dmapper", "compareRegionStarts() failed: " << e);
return false;
}
return true;
@@ -1101,7 +1101,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
catch ( const lang::IllegalArgumentException &e )
{
SAL_INFO("writerfilter.dmapper",
- "Conversion to table error: " << e.Message);
+ "Conversion to table error: " << e);
#ifdef DEBUG_WRITERFILTER
TagLogger::getInstance().chars(std::string("failed to import table!"));
#endif
@@ -1109,7 +1109,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
catch ( const uno::Exception &e )
{
SAL_INFO("writerfilter.dmapper",
- "Exception during table creation: " << e.Message);
+ "Exception during table creation: " << e);
}
// If we have a table with a start and an end position, we should make it a floating one.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a6223b741061..b5572dc484aa 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1281,7 +1281,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap )
}
catch(const uno::Exception& e)
{
- SAL_WARN( "writerfilter.dmapper", "finishParagraph() exception: " << e.Message );
+ SAL_WARN( "writerfilter.dmapper", "finishParagraph() " << e );
}
}
@@ -1741,7 +1741,7 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote )
}
catch( const uno::Exception& e )
{
- SAL_WARN("writerfilter.dmapper", "exception in PushFootOrEndnote: " << e.Message);
+ SAL_WARN("writerfilter.dmapper", "exception in PushFootOrEndnote: " << e);
}
}
@@ -1859,7 +1859,7 @@ void DomainMapper_Impl::PushAnnotation()
}
catch( const uno::Exception& rException)
{
- SAL_WARN("writerfilter.dmapper", "exception in PushAnnotation: " << rException.Message);
+ SAL_WARN("writerfilter.dmapper", "exception in PushAnnotation: " << rException);
}
}
@@ -1927,7 +1927,7 @@ void DomainMapper_Impl::PopAnnotation()
catch (uno::Exception const& e)
{
SAL_WARN("writerfilter.dmapper",
- "Cannot insert annotation field: exception: " << e.Message);
+ "Cannot insert annotation field: " << e);
}
m_xAnnotationField.clear();
@@ -2120,7 +2120,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
}
catch ( const uno::Exception& e )
{
- SAL_WARN("writerfilter.dmapper", "Exception when adding shape: " << e.Message);
+ SAL_WARN("writerfilter.dmapper", "Exception when adding shape: " << e);
}
}
/*
@@ -2738,7 +2738,7 @@ void DomainMapper_Impl::ChainTextFrames()
}
catch (const uno::Exception& rException)
{
- SAL_WARN("writerfilter.dmapper", "failed. message: " << rException.Message);
+ SAL_WARN("writerfilter.dmapper", "failed. message: " << rException);
}
}
@@ -4432,7 +4432,7 @@ void DomainMapper_Impl::CloseFieldCommand()
}
catch( const uno::Exception& e )
{
- SAL_WARN( "writerfilter.dmapper", "Exception in CloseFieldCommand(): " << e.Message );
+ SAL_WARN( "writerfilter.dmapper", "Exception in CloseFieldCommand(): " << e );
}
pContext->SetCommandCompleted();
}
@@ -4604,7 +4604,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
catch (const uno::Exception& e)
{
SAL_WARN("writerfilter.dmapper",
- "DomainMapper_Impl::SetFieldResult: exception: " << e.Message);
+ "DomainMapper_Impl::SetFieldResult: " << e);
}
}
}
@@ -5084,7 +5084,7 @@ void DomainMapper_Impl::ExecuteFrameConversion()
}
catch( const uno::Exception& rEx)
{
- SAL_WARN( "writerfilter.dmapper", "Exception caught when converting to frame: " + rEx.Message );
+ SAL_WARN( "writerfilter.dmapper", "Exception caught when converting to frame: " << rEx );
}
}
m_xFrameStartRange = nullptr;
@@ -5288,7 +5288,7 @@ uno::Reference<container::XIndexAccess> DomainMapper_Impl::GetCurrentNumberingRu
catch (const uno::Exception& e)
{
SAL_WARN("writerfilter.dmapper",
- "GetCurrentNumberingRules: exception caught: " << e.Message);
+ "GetCurrentNumberingRules: exception caught: " << e);
}
return xRet;
}
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 553a4e86a8f5..2173a015b173 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -381,7 +381,7 @@ public:
}
catch( const uno::Exception& e )
{
- SAL_WARN("writerfilter", "failed. Message :" << e.Message);
+ SAL_WARN("writerfilter", "failed. Message :" << e);
}
}
@@ -1338,7 +1338,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
}
catch( const uno::Exception& e )
{
- SAL_WARN("writerfilter", "failed. Message :" << e.Message);
+ SAL_WARN("writerfilter", "failed. Message :" << e);
}
return xGraphicObject;
}
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx
index 851825e27699..4c59ba3b38ba 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/writerfilter/source/dmapper/ModelEventListener.cxx
@@ -87,7 +87,7 @@ void ModelEventListener::notifyEvent( const document::EventObject& rEvent )
}
catch( const uno::Exception& rEx )
{
- SAL_WARN("writerfilter", "exception while updating indexes: " << rEx.Message);
+ SAL_WARN("writerfilter", "exception while updating indexes: " << rEx);
}
}
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 2fe06c4d9508..d1406421140a 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -633,17 +633,17 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
}
catch( const lang::IllegalArgumentException& e )
{
- SAL_WARN( "writerfilter", "Exception: " << e.Message );
+ SAL_WARN( "writerfilter", e );
assert( !"Incorrect argument to UNO call" );
}
catch( const uno::RuntimeException& e )
{
- SAL_WARN( "writerfilter", "Exception: " << e.Message );
+ SAL_WARN( "writerfilter", e );
assert( !"Incorrect argument to UNO call" );
}
catch( const uno::Exception& e )
{
- SAL_WARN( "writerfilter", "Exception: " << e.Message );
+ SAL_WARN( "writerfilter", e );
}
}
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index ae1e13a0041b..3bf20e91c9cd 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -125,7 +125,7 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
}
catch( const uno::Exception& e )
{
- SAL_WARN("writerfilter", "Exception in OLE Handler: " << e.Message);
+ SAL_WARN("writerfilter", "Exception in OLE Handler: " << e);
}
// No need to set the wrapping here as it's either set in oox or will be set later
}
@@ -176,7 +176,7 @@ void OLEHandler::lcl_sprm(Sprm & rSprm)
}
catch( const uno::Exception& e )
{
- SAL_WARN("writerfilter", "Exception in OLE Handler: " << e.Message);
+ SAL_WARN("writerfilter", "Exception in OLE Handler: " << e);
}
}
}
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 9ff1da5d0cd2..be506993b9df 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -510,7 +510,7 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( const un
}
catch ( const uno::Exception& rException )
{
- SAL_WARN( "writerfilter", "SectionPropertyMap::GetPageStyle() failed: " << rException.Message );
+ SAL_WARN( "writerfilter", "SectionPropertyMap::GetPageStyle() failed: " << rException );
}
return xRet;
@@ -796,7 +796,7 @@ void SectionPropertyMap::CopyHeaderFooterTextProperty( const uno::Reference< bea
}
catch ( const uno::Exception& e )
{
- SAL_INFO( "writerfilter", "An exception occurred in SectionPropertyMap::CopyHeaderFooterTextProperty( ) - " << e.Message );
+ SAL_INFO( "writerfilter", "An exception occurred in SectionPropertyMap::CopyHeaderFooterTextProperty( ) - " << e );
}
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 9e5d80735c47..8335ecd61d9d 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -375,7 +375,7 @@ void StyleSheetTable_Impl::SetPropertiesToDefault(const uno::Reference<style::XS
}
catch(const uno::Exception& rException)
{
- SAL_INFO("writerfilter", "setPropertyToDefault(" << aPropertyNames[i] << ") failed: " << rException.Message);
+ SAL_INFO("writerfilter", "setPropertyToDefault(" << aPropertyNames[i] << ") failed: " << rException);
}
}
}
@@ -1209,7 +1209,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
}
catch( const uno::Exception& rException )
{
- SAL_WARN("writerfilter", "Styles could not be imported completely: " << rException.Message);
+ SAL_WARN("writerfilter", "Styles could not be imported completely: " << rException);
}
}
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index 87ca79b5e118..707b8223f565 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -320,7 +320,7 @@ void TableManager::resolveCurrentTable()
}
catch (css::uno::Exception const& e)
{
- SAL_WARN("writerfilter", "resolving of current table failed with: " << e.Message);
+ SAL_WARN("writerfilter", "resolving of current table failed with: " << e);
}
}
mState.resetTableProps();