From 03a9f139bd9ea1a4f9096fc982e6b326def58532 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 19 Sep 2012 13:15:15 +0200
Subject: ComponentContext::getUnoContext -> getComponentContext simplification

...and some further clean-up.

Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
---
 svl/source/fsstor/fsstorage.cxx      | 7 +++----
 svl/source/misc/documentlockfile.cxx | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'svl/source')

diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 00f93802562a..98908c3abf1c 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -46,7 +46,6 @@
 
 
 #include <comphelper/processfactory.hxx>
-#include <comphelper/componentcontext.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/exc_hlp.hxx>
@@ -476,7 +475,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
             {
                 uno::Reference<ucb::XSimpleFileAccess2> xSimpleFileAccess(
                     ucb::SimpleFileAccess::create(
-                        comphelper::ComponentContext(m_pImpl->m_xFactory).getUNOContext() ) );
+                        comphelper::getComponentContext(m_pImpl->m_xFactory) ) );
                 xResult = xSimpleFileAccess->openFileReadWrite( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) );
             }
             else
@@ -685,7 +684,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt
         uno::Reference< io::XInputStream > xInStream = aResultContent.openStream();
 
         xTempResult = uno::Reference < io::XStream >(
-                    io::TempFile::create(comphelper::ComponentContext(m_pImpl->m_xFactory).getUNOContext()),
+                    io::TempFile::create(comphelper::getComponentContext(m_pImpl->m_xFactory)),
                     uno::UNO_QUERY_THROW );
         uno::Reference < io::XOutputStream > xTempOut = xTempResult->getOutputStream();
         uno::Reference < io::XInputStream > xTempIn = xTempResult->getInputStream();
@@ -1466,7 +1465,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl
             {
                 uno::Reference<ucb::XSimpleFileAccess2> xSimpleFileAccess(
                     ucb::SimpleFileAccess::create(
-                        comphelper::ComponentContext(m_pImpl->m_xFactory).getUNOContext() ) );
+                        comphelper::getComponentContext(m_pImpl->m_xFactory) ) );
                 uno::Reference< io::XStream > xStream =
                     xSimpleFileAccess->openFileReadWrite( aFileURL.GetMainURL( INetURLObject::NO_DECODE ) );
 
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index 119ebcdd6a1c..cebc89b26b1c 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -37,7 +37,6 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <comphelper/componentcontext.hxx>
 
 #include <unotools/bootstrap.hxx>
 
@@ -93,7 +92,7 @@ sal_Bool DocumentLockFile::CreateOwnLockFile()
     try
     {
         uno::Reference< io::XStream > xTempFile(
-            io::TempFile::create(comphelper::ComponentContext(m_xFactory).getUNOContext()),
+            io::TempFile::create(comphelper::getComponentContext(m_xFactory)),
             uno::UNO_QUERY_THROW );
         uno::Reference< io::XSeekable > xSeekable( xTempFile, uno::UNO_QUERY_THROW );
 
-- 
cgit