mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EmbeddedObjectContainer: log some exceptions

Browse Source 
Change-Id: I7356dfedc6121876641ef0e5f41d50db725980d4
This commit is contained in:
Michael Stahl
2013-02-08 19:28:42 +01:00
parent c5b83e07f8
commit 44f74a0c2b
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
comphelper/source/container/embeddedobjectcontainer.cxx
View File

@@ -380,8 +380,10 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( con
// insert object into my list
AddEmbeddedObject( xObj, rName );
}
catch (const uno::Exception&)
catch (uno::Exception const& e)
{
SAL_WARN("comphelper", "EmbeddedObjectContainer::Get_Impl: "
"exception caught: " << e.Message);
}
return xObj;
@@ -416,8 +418,10 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde
OSL_ENSURE( !xObj.is() || xObj->getCurrentState() != embed::EmbedStates::LOADED,
"A freshly create object should be running always!\n" );
}
catch (const uno::Exception&)
catch (uno::Exception const& e)
{
SAL_WARN("comphelper", "EmbeddedObjectContainer::CreateEmbeddedObject: "
"exception caught: " << e.Message);
}
return xObj;
@@ -523,8 +527,10 @@ sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < em
}
}
}
catch (const uno::Exception&)
catch (uno::Exception const& e)
{
SAL_WARN("comphelper", "EmbeddedObjectContainer::StoreEmbeddedObject: "
"exception caught: " << e.Message);
// TODO/LATER: better error recovery should keep storage intact
return sal_False;
}
@@ -585,9 +591,12 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
xProps->setPropertyValue( OUString( "MediaType" ),
uno::makeAny( OUString( "application/vnd.sun.star.oleobject" ) ) );
}
catch (const uno::Exception&)
catch (uno::Exception const& e)
{
// complete disaster!
SAL_WARN("comphelper",
"EmbeddedObjectContainer::InsertEmbeddedObject: "
"exception caught: " << e.Message);
return uno::Reference < embed::XEmbeddedObject >();
}
}
@@ -669,8 +678,10 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
AddEmbeddedObject( xObj, rNewName );
}
catch (const uno::Exception&)
catch (uno::Exception const& e)
{
SAL_WARN("comphelper", "EmbeddedObjectContainer::InsertEmbeddedLink: "
"exception caught: " << e.Message);
}
return xObj;