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

Resolves: rhbz#976304 gallery elements may not support document.Settings

Browse Source 
so the createInstance throws, so the element doesn't get inserted into
the documents.

regression since f0cd6fe907

Change-Id: Ie6cef7a4f0d5ac8a34d41139c3439fc04e9c7f20
This commit is contained in:
Caolán McNamara
2013-06-23 20:46:07 +01:00
parent 3f0b577079
commit fd240ba81b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
xmloff/source/draw/sdxmlexp.cxx
View File

@@ -2915,15 +2915,16 @@ XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool()
Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY );
if( xFac.is() )
{
Reference<beans::XPropertySet> const xProps( xFac->createInstance(
"com.sun.star.document.Settings"), UNO_QUERY );
if (xProps.is())
try
{
try // clipboard document doesn't have shell so throws here
{
xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts;
}
catch (uno::Exception const&) { }
Reference<beans::XPropertySet> const xProps( xFac->createInstance(
"com.sun.star.document.Settings"), UNO_QUERY_THROW );
xProps->getPropertyValue("EmbedFonts") >>= bEmbedFonts;
}
catch (...)
{
// clipboard document doesn't have shell so throws from getPropertyValue
// gallery elements may not support com.sun.star.document.Settings so throws from createInstance
}
}
}