diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-22 23:48:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-22 23:49:06 +0200 |
| commit | 5040ad523e0e4ad336e2449030516f5a90ea5656 (patch) | |
| tree | 8d64b892214397af5018c32d14f3555e863ad878 /desktop | |
| parent | bcc31e249fde6536ab96ffcf2a8e542275efa69b (diff) | |
Remove unnecessary component_getProcessComponentContext C wrapper
Change-Id: I9d9f1a542dbbfc461dd27c32b57e4cad5532fab0
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/check_ext_deps.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 4f834d32c6f4..23c6b92c8bbb 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -392,7 +392,8 @@ sal_Bool Desktop::CheckExtensionDependencies() return false; } - uno::Reference< uno::XComponentContext > xContext = comphelper_getProcessComponentContext(); + uno::Reference< uno::XComponentContext > xContext( + comphelper::getProcessComponentContext()); bool bDependenciesValid = impl_checkDependencies( xContext ); @@ -414,7 +415,7 @@ void Desktop::SynchronizeExtensionRepositories() { SAL_INFO( "desktop.app", "desktop (jl) ::Desktop::SynchronizeExtensionRepositories"); uno::Reference< uno::XComponentContext > context( - comphelper_getProcessComponentContext()); + comphelper::getProcessComponentContext()); uno::Reference< ucb::XCommandEnvironment > silent( new SilentCommandEnv(context, this)); if (m_bCleanedExtensionCache) { diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 53d7e7f45c3f..8b00b5543898 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -324,9 +324,8 @@ namespace dp_misc { DescriptionInfoset getDescriptionInfoset(OUString const & sExtensionFolderURL) { Reference< css::xml::dom::XNode > root; - Reference<css::uno::XComponentContext> context = - comphelper_getProcessComponentContext(); - OSL_ASSERT(context.is()); + Reference<css::uno::XComponentContext> context( + comphelper::getProcessComponentContext()); try { root = ExtensionDescription( diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 17c4fb2a3e44..3dfb355d313b 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -548,7 +548,7 @@ void syncRepositories( { xExtensionManager = deployment::ExtensionManager::get( - comphelper_getProcessComponentContext()); + comphelper::getProcessComponentContext()); if (xExtensionManager.is()) { |