From c2ca6fabd1afc3fc07001721c2069d3c8db7000a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Sat, 29 Sep 2012 17:20:22 +0200
Subject: Use comphelper::getComponentContext

...and some further clean up.

Change-Id: Id294c0f38fe0041646fc86cacbd2e19734c746a9
---
 embeddedobj/source/general/docholder.cxx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'embeddedobj')

diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 65235d0f4d17..75643c901bda 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/embed/Aspects.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -635,15 +634,9 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenuesForInplace(
 
     uno::Reference< lang::XSingleComponentFactory > xIndAccessFact( xContMenu, uno::UNO_QUERY_THROW );
 
-    uno::Reference< uno::XComponentContext > xComponentContext;
-
-    uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
-    if ( xProps.is() )
-        xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>=
-            xComponentContext;
-
     uno::Reference< container::XIndexContainer > xMergedMenu(
-            xIndAccessFact->createInstanceWithContext( xComponentContext ),
+            xIndAccessFact->createInstanceWithContext(
+                comphelper::getProcessComponentContext() ),
             uno::UNO_QUERY_THROW );
 
     FindConnectPoints( xContMenu, nContPoints );
-- 
cgit