summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-11-30 14:19:29 +0200
committerAndras Timar <andras.timar@collabora.com>2021-03-31 10:28:06 +0200
commit54bfbdc2ffb8938dbef5febe50c22e4eaf4b3c03 (patch)
tree11c99039401b885c8809b7ffff8ffeebf9781cb9 /writerfilter
parent09deac70e486ca609a25a817cdbea754eb7c5649 (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')
-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 7cda0e0df1dc..091162c43738 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2063,7 +2063,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&)
{
@@ -2221,11 +2221,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" );
}
}
@@ -2364,7 +2364,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" );
}
}
@@ -2419,7 +2419,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" );
}
}
@@ -2713,7 +2713,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" );
}
}
@@ -6469,11 +6469,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 ae1967a4a7eb..d83fad181d82 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -306,7 +306,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 f3fa51ab8c55..6d65c7ce61c9 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;
}
@@ -1849,7 +1849,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
}
catch ( const uno::Exception& )
{
- OSL_FAIL( "Exception in SectionPropertyMap::CloseSectionGroup" );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "SectionPropertyMap::CloseSectionGroup" );
}
}
@@ -1999,7 +1999,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 )
@@ -2011,7 +2011,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 58a30c1825ea..9eacbcd95c00 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1566,7 +1566,7 @@ void StyleSheetTable::applyDefaults(bool bParaProperties)
}
catch( const uno::Exception& )
{
- OSL_FAIL( "setPropertyValue exception");
+ TOOLS_WARN_EXCEPTION( "writerfilter", "setPropertyValue");
}
}
}
@@ -1587,7 +1587,7 @@ void StyleSheetTable::applyDefaults(bool bParaProperties)
}
catch( const uno::Exception& )
{
- OSL_FAIL( "setPropertyValue exception");
+ TOOLS_WARN_EXCEPTION( "writerfilter", "exception");
}
}
}
@@ -1639,7 +1639,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) );
@@ -1647,7 +1647,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;