summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-11-30 14:19:29 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-12-01 09:28:52 +0100
commitd6d80c4e1783b4459bd4a8fbcbdfeebe416c1cb5 (patch)
tree995c41a30f4224233267a8cfb05da41ae8c10275 /writerfilter/source/dmapper
parent102fdc08b86599b9e538d2f38df865d56b3ec63d (diff)
OSL_FAIL.*exception -> TOOLS_WARN_EXCEPTION
Change-Id: I6800e23ead2767d245d5da71d2d40e0f8a6d7e1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106859 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter/source/dmapper')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx16
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx2
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx10
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx8
4 files changed, 18 insertions, 18 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 556e5abc495d..3e50c10ee4b4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2058,7 +2058,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
}
catch(const lang::IllegalArgumentException&)
{
- OSL_FAIL( "IllegalArgumentException in DomainMapper_Impl::finishParagraph" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "DomainMapper_Impl::finishParagraph" );
}
catch(const uno::Exception&)
{
@@ -2216,11 +2216,11 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, const Proper
}
catch(const lang::IllegalArgumentException&)
{
- OSL_FAIL( "IllegalArgumentException in DomainMapper_Impl::appendTextPortion" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "DomainMapper_Impl::appendTextPortion" );
}
catch(const uno::Exception&)
{
- OSL_FAIL( "Exception in DomainMapper_Impl::appendTextPortion" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "DomainMapper_Impl::appendTextPortion" );
}
}
@@ -2350,7 +2350,7 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const std::share
}
catch( const uno::Exception& )
{
- OSL_FAIL( "Exception in creation of OLE object" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "in creation of OLE object" );
}
}
@@ -2405,7 +2405,7 @@ void DomainMapper_Impl::appendStarMath( const Value& val )
}
catch( const uno::Exception& )
{
- OSL_FAIL( "Exception in creation of StarMath object" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "in creation of StarMath object" );
}
}
@@ -2699,7 +2699,7 @@ void DomainMapper_Impl::CreateRedline(uno::Reference<text::XTextRange> const& xR
}
catch( const uno::Exception & )
{
- OSL_FAIL( "Exception in makeRedline" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "in makeRedline" );
}
}
@@ -6446,11 +6446,11 @@ void DomainMapper_Impl::PopFieldContext()
}
catch(const lang::IllegalArgumentException&)
{
- OSL_FAIL( "IllegalArgumentException in PopFieldContext()" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "PopFieldContext()" );
}
catch(const uno::Exception&)
{
- OSL_FAIL( "exception in PopFieldContext()" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "PopFieldContext()" );
}
}
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 46cb83f4c732..f7cc322d808a 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -321,7 +321,7 @@ OUString OLEHandler::copyOLEOStream(
}
catch( const uno::Exception& )
{
- OSL_FAIL("exception in OLEHandler::createOLEObject");
+ TOOLS_WARN_EXCEPTION( "writerfilter", "OLEHandler::createOLEObject");
}
return sRet;
}
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 335108f3c609..40dc5e0da8cc 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -677,7 +677,7 @@ void SectionPropertyMap::DontBalanceTextColumns()
}
catch ( const uno::Exception& )
{
- OSL_FAIL( "Exception in SectionPropertyMap::DontBalanceTextColumns" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "SectionPropertyMap::DontBalanceTextColumns" );
}
}
@@ -792,7 +792,7 @@ uno::Reference< text::XTextColumns > SectionPropertyMap::ApplyColumnProperties(
}
catch ( const uno::Exception& )
{
- OSL_FAIL( "Exception in SectionPropertyMap::ApplyColumnProperties" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "SectionPropertyMap::ApplyColumnProperties" );
}
return xColumns;
}
@@ -1854,7 +1854,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
}
catch ( const uno::Exception& )
{
- OSL_FAIL( "Exception in SectionPropertyMap::CloseSectionGroup" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "SectionPropertyMap::CloseSectionGroup" );
}
}
@@ -2004,7 +2004,7 @@ void SectionPropertyMap::ApplyProperties_( const uno::Reference< beans::XPropert
}
catch ( const uno::Exception& )
{
- OSL_FAIL( "Exception in SectionPropertyMap::ApplyProperties_" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "SectionPropertyMap::ApplyProperties_" );
}
}
for ( size_t i = 0; i < vNames.size(); ++i )
@@ -2016,7 +2016,7 @@ void SectionPropertyMap::ApplyProperties_( const uno::Reference< beans::XPropert
}
catch ( const uno::Exception& )
{
- OSL_FAIL( "Exception in SectionPropertyMap::ApplyProperties_" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "SectionPropertyMap::ApplyProperties_" );
}
}
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index a67a7aed972e..731facdaff84 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1556,7 +1556,7 @@ void StyleSheetTable::applyDefaults(bool bParaProperties)
}
catch( const uno::Exception& )
{
- OSL_FAIL( "setPropertyValue exception");
+ TOOLS_WARN_EXCEPTION( "writerfilter", "setPropertyValue");
}
}
}
@@ -1577,7 +1577,7 @@ void StyleSheetTable::applyDefaults(bool bParaProperties)
}
catch( const uno::Exception& )
{
- OSL_FAIL( "setPropertyValue exception");
+ TOOLS_WARN_EXCEPTION( "writerfilter", "exception");
}
}
}
@@ -1629,7 +1629,7 @@ OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProp
}
catch( const uno::Exception& )
{
- OSL_FAIL( "Exception in StyleSheetTable::getOrCreateCharStyle - Style::setPropertyValue");
+ TOOLS_WARN_EXCEPTION( "writerfilter", "StyleSheetTable::getOrCreateCharStyle - Style::setPropertyValue");
}
}
xCharStyles->insertByName( sListLabel, uno::makeAny( xStyle) );
@@ -1637,7 +1637,7 @@ OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProp
}
catch( const uno::Exception& )
{
- OSL_FAIL( "Exception in StyleSheetTable::getOrCreateCharStyle");
+ TOOLS_WARN_EXCEPTION( "writerfilter", "StyleSheetTable::getOrCreateCharStyle");
}
return sListLabel;