diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-19 13:15:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-19 13:16:38 +0200 |
| commit | 03a9f139bd9ea1a4f9096fc982e6b326def58532 (patch) | |
| tree | bfb7a08bb4831a1a46b48c3bb49afa77ca436349 /desktop | |
| parent | e8a169c93d7e2443a2e56afe7e99cd0721a2c27b (diff) | |
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up.
Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/migration/migration.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index fe98ad01036f..bcc67ed4a801 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -35,7 +35,6 @@ #include "migration_impl.hxx" #include <unotools/textsearch.hxx> -#include <comphelper/componentcontext.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <unotools/bootstrap.hxx> @@ -275,7 +274,7 @@ sal_Bool MigrationImpl::doMigration() lArgs[1] <<= embed::ElementModes::READ; uno::Reference< lang::XSingleServiceFactory > xStorageFactory( - embed::FileSystemStorageFactory::create(comphelper::ComponentContext(m_xFactory).getUNOContext())); + embed::FileSystemStorageFactory::create(comphelper::getComponentContext(m_xFactory))); uno::Reference< embed::XStorage > xModules(xStorageFactory->createInstanceWithArguments(lArgs), uno::UNO_QUERY); uno::Reference< ui::XUIConfigurationManager > xOldCfgManager( m_xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UIConfigurationManager"))), uno::UNO_QUERY ); uno::Reference< ui::XUIConfigurationStorage > xOldCfgStorage( xOldCfgManager, uno::UNO_QUERY ); @@ -997,7 +996,7 @@ void MigrationImpl::runServices() lArgs[1] <<= embed::ElementModes::READ; uno::Reference< lang::XSingleServiceFactory > xStorageFactory( - embed::FileSystemStorageFactory::create(comphelper::ComponentContext(m_xFactory).getUNOContext())); + embed::FileSystemStorageFactory::create(comphelper::getComponentContext(m_xFactory))); uno::Reference< embed::XStorage > xModules; xModules = uno::Reference< embed::XStorage >(xStorageFactory->createInstanceWithArguments(lArgs), uno::UNO_QUERY); |