diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-02 15:03:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-04 14:42:52 +0200 |
| commit | c25cb8a641723ab098980bb842caf75c0dc9b059 (patch) | |
| tree | e264e2727309789e06147a7275b91abd05f9fcff /dbaccess/source/filter/xml | |
| parent | Related: rhbz#862467 band-aid when creating embedded object fails (diff) | |
| download | core-c25cb8a641723ab098980bb842caf75c0dc9b059.tar.gz core-c25cb8a641723ab098980bb842caf75c0dc9b059.zip | |
fdo#46808, Adapt task::InteractionHandler UNO service to new style
Since we don't need to expose XInitialisation, we can make the new-style
service implement XInteractionHandler2.
Change-Id: Ib27beed1c12df17592c6472d6f58c233d2c41558
Diffstat (limited to 'dbaccess/source/filter/xml')
| -rw-r--r-- | dbaccess/source/filter/xml/dbloader2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 8b2d3939b767..52562d997540 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> +#include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> @@ -428,9 +429,8 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: // not touch it. if ( !aMediaDesc.has( "InteractionHandler" ) ) { - Reference< XInteractionHandler > xHandler; - if ( m_aContext.createComponent( "com.sun.star.task.InteractionHandler", xHandler ) ) - aMediaDesc.put( "InteractionHandler", xHandler ); + Reference< XInteractionHandler > xHandler( InteractionHandler::createDefault(m_aContext.getUNOContext()), UNO_QUERY_THROW ); + aMediaDesc.put( "InteractionHandler", xHandler ); } // it's allowed to pass an existing document |