diff options
Diffstat (limited to 'desktop/source/migration/services/oo3extensionmigration.cxx')
| -rw-r--r-- | desktop/source/migration/services/oo3extensionmigration.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 6b68272db60a..d8e90abe416f 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -21,15 +21,15 @@ #include "oo3extensionmigration.hxx" #include <sal/log.hxx> #include <osl/file.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/bootstrap.hxx> #include <unotools/textsearch.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> +#include <rtl/ref.hxx> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/xml/xpath/XPathAPI.hpp> #include <com/sun/star/xml/xpath/XPathException.hpp> @@ -237,14 +237,12 @@ void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir ) deployment::ExtensionManager::get( m_ctx ) ); try { - TmpRepositoryCommandEnv* pCmdEnv = new TmpRepositoryCommandEnv(); + rtl::Reference<TmpRepositoryCommandEnv> pCmdEnv = new TmpRepositoryCommandEnv(); - uno::Reference< ucb::XCommandEnvironment > xCmdEnv( - static_cast< cppu::OWeakObject* >( pCmdEnv ), uno::UNO_QUERY ); uno::Reference< task::XAbortChannel > xAbortChannel; extMgr->addExtension( sSourceDir, uno::Sequence<beans::NamedValue>(), "user", - xAbortChannel, xCmdEnv ); + xAbortChannel, pCmdEnv ); } catch ( css::uno::Exception & ) { |