Kaydet (Commit) 5040ad52 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove unnecessary component_getProcessComponentContext C wrapper

Change-Id: I9d9f1a542dbbfc461dd27c32b57e4cad5532fab0
üst bcc31e24
......@@ -99,15 +99,4 @@ Reference< XComponentContext > getProcessComponentContext()
} // namespace comphelper
extern "C" {
uno::XComponentContext * comphelper_getProcessComponentContext()
{
uno::Reference<uno::XComponentContext> xRet;
xRet = ::comphelper::getProcessComponentContext();
if (xRet.is())
xRet->acquire();
return xRet.get();
}
} // extern "C"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -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) {
......
......@@ -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(
......
......@@ -548,7 +548,7 @@ void syncRepositories(
{
xExtensionManager =
deployment::ExtensionManager::get(
comphelper_getProcessComponentContext());
comphelper::getProcessComponentContext());
if (xExtensionManager.is())
{
......
......@@ -71,14 +71,6 @@ getProcessComponentContext();
}
extern "C" {
/// @internal ATTENTION returns ACQUIRED pointer! release it explicitly!
COMPHELPER_DLLPUBLIC
::com::sun::star::uno::XComponentContext *
comphelper_getProcessComponentContext();
} // extern "C"
#endif // _COMPHELPER_PROCESSFACTORY_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -162,8 +162,8 @@ protected:
void createAnnotation( Reference< XAnnotation >& xAnnotation, SdPage* pPage )
{
Reference<XComponentContext> xContext (comphelper_getProcessComponentContext());
xAnnotation.set( new Annotation(xContext, pPage) );
xAnnotation.set(
new Annotation(comphelper::getProcessComponentContext(), pPage));
pPage->addAnnotation(xAnnotation);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment