[Libreoffice-commits] core.git: xmloff/source
Caolán McNamara
caolanm at redhat.com
Sun Jun 23 13:13:04 PDT 2013
xmloff/source/draw/sdxmlexp.cxx | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
New commits:
commit fd240ba81b317a54fc4512aaec33650cd7a30e29
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jun 23 20:46:07 2013 +0100
Resolves: rhbz#976304 gallery elements may not support document.Settings
so the createInstance throws, so the element doesn't get inserted into
the documents.
regression since f0cd6fe9075cd0aa00162474784ad804a07ed138
Change-Id: Ie6cef7a4f0d5ac8a34d41139c3439fc04e9c7f20
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 6e86da3..c9149b9 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -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
}
}
}
More information about the Libreoffice-commits
mailing list