diff options
| -rw-r--r-- | xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 3255e2e6fdbf..36bb7e4d8e7e 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -21,6 +21,7 @@ #include <string_view> +#include <sal/log.hxx> #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XModifiable2.hpp> @@ -74,6 +75,7 @@ XMLEmbeddedObjectImportContext_Impl::XMLEmbeddedObjectImportContext_Impl( SvXMLImportContext( rImport, nPrfx, rLName ), xHandler( rHandler ) { + assert(xHandler); } SvXMLImportContextRef XMLEmbeddedObjectImportContext_Impl::CreateChildContext( @@ -115,15 +117,18 @@ void XMLEmbeddedObjectImportContext::SetComponent( Reference< XComponent > const Reference< XComponentContext > xContext( GetImport().GetComponentContext() ); - xHandler.set( - xContext->getServiceManager()->createInstanceWithArgumentsAndContext(sFilterService, aArgs, xContext), - UNO_QUERY); - - if( !xHandler.is() ) + Reference<XInterface> xFilter = + xContext->getServiceManager()->createInstanceWithArgumentsAndContext(sFilterService, aArgs, xContext); + SAL_WARN_IF(!xFilter, "xmloff", "could not create filter " << sFilterService); + if( !xFilter.is() ) return; - if (SvXMLImport *pFastHandler = dynamic_cast<SvXMLImport*>(xHandler.get())) + if (SvXMLImport *pFastHandler = dynamic_cast<SvXMLImport*>(xFilter.get())) xHandler.set( new SvXMLLegacyToFastDocHandler( pFastHandler ) ); + else + xHandler.set(xFilter, UNO_QUERY); + + assert( xHandler ); try { |