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 /basic | |
| parent | e8a169c93d7e2443a2e56afe7e99cd0721a2c27b (diff) | |
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up.
Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 3 | ||||
| -rw-r--r-- | basic/source/uno/namecont.cxx | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index aa595157807a..7f2753ad8b61 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -37,7 +37,6 @@ #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> -#include <comphelper/componentcontext.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> @@ -543,7 +542,7 @@ SbError SbiStream::Open if( xSMgr.is() ) { Reference< XSimpleFileAccess2 > - xSFI( SimpleFileAccess::create( comphelper::ComponentContext(xSMgr).getUNOContext() ) ); + xSFI( SimpleFileAccess::create( comphelper::getComponentContext(xSMgr) ) ); try { diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index dc72b38d83b6..091f04f96bbb 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -54,7 +54,7 @@ #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/util/PathSubstitution.hpp> #include <com/sun/star/deployment/ExtensionManager.hpp> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <cppuhelper/exc_hlp.hxx> #include <basic/sbmod.hxx> @@ -377,9 +377,9 @@ SfxLibraryContainer::SfxLibraryContainer( void ) mxMSF = comphelper::getProcessServiceFactory(); SAL_WARN_IF(!mxMSF.is(), "basic", "couldn't get ProcessServiceFactory"); - mxSFI = ucb::SimpleFileAccess::create( comphelper::ComponentContext(mxMSF).getUNOContext() ); + mxSFI = ucb::SimpleFileAccess::create( comphelper::getComponentContext(mxMSF) ); - mxStringSubstitution = util::PathSubstitution::create( comphelper::ComponentContext(mxMSF).getUNOContext() ); + mxStringSubstitution = util::PathSubstitution::create( comphelper::getComponentContext(mxMSF) ); } SfxLibraryContainer::~SfxLibraryContainer() @@ -2694,7 +2694,7 @@ void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OU Reference< XSimpleFileAccess2 > xToUseSFI; if( Handler.is() ) { - xToUseSFI = ucb::SimpleFileAccess::create( comphelper::ComponentContext(mxMSF).getUNOContext() ); + xToUseSFI = ucb::SimpleFileAccess::create( comphelper::getComponentContext(mxMSF) ); xToUseSFI->setInteractionHandler( Handler ); } |