Kaydet (Commit) cc85e44c authored tarafından Michael Stahl's avatar Michael Stahl

SdXMLExport::CreateFontAutoStylePool: "EmbedFonts": ignore exceptions

(regression from f0cd6fe9)

Change-Id: Ia86c0d168e9dd24555e7431666c0d783daef3b6a
üst e8a526e1
...@@ -2912,15 +2912,22 @@ OUString SAL_CALL SdXMLExport::getImplementationName() throw( uno::RuntimeExcept ...@@ -2912,15 +2912,22 @@ OUString SAL_CALL SdXMLExport::getImplementationName() throw( uno::RuntimeExcept
XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool() XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool()
{ {
bool bEmbedFonts = false; bool bEmbedFonts = false;
if( getExportFlags() & EXPORT_CONTENT ) { if (getExportFlags() & EXPORT_CONTENT)
{
Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY ); Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY );
if( xFac.is() ) if( xFac.is() )
{
Reference<beans::XPropertySet> const xProps( xFac->createInstance(
"com.sun.star.document.Settings"), UNO_QUERY );
if (xProps.is())
{ {
Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), UNO_QUERY ); try // clipboard document doesn't have shell so throws here
if( xProps.is() ) {
xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts; xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts;
}
catch (uno::Exception const&) { }
} }
}
} }
XMLFontAutoStylePool *pPool = new XMLFontAutoStylePool( *this, bEmbedFonts ); XMLFontAutoStylePool *pPool = new XMLFontAutoStylePool( *this, bEmbedFonts );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment