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 /embeddedobj/source/commonembedding | |
| parent | n#778828 testcase (diff) | |
| download | core-03a9f139bd9ea1a4f9096fc982e6b326def58532.tar.gz core-03a9f139bd9ea1a4f9096fc982e6b326def58532.zip | |
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up.
Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
Diffstat (limited to 'embeddedobj/source/commonembedding')
| -rw-r--r-- | embeddedobj/source/commonembedding/embedobj.cxx | 4 | ||||
| -rw-r--r-- | embeddedobj/source/commonembedding/persistence.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 06ad663ee351..ae8ef08665d6 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/embed/EmbedMisc.hpp> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> #include <rtl/logfile.hxx> @@ -323,7 +323,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) uno::Reference< embed::XComponentSupplier > xCompSupl( m_xClientSite, uno::UNO_QUERY_THROW ); uno::Reference< uno::XInterface > xContDoc( xCompSupl->getComponent(), uno::UNO_QUERY_THROW ); - uno::Reference< frame::XModuleManager2 > xManager( frame::ModuleManager::create(comphelper::ComponentContext(m_xFactory).getUNOContext()) ); + uno::Reference< frame::XModuleManager2 > xManager( frame::ModuleManager::create(comphelper::getComponentContext(m_xFactory)) ); aModuleName = xManager->identify( xContDoc ); } diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 4cd67ef22b18..f881f108f022 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -54,8 +54,8 @@ #include <com/sun/star/beans/IllegalTypeException.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> -#include <comphelper/componentcontext.hxx> #include <comphelper/fileformat.h> +#include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/namedvaluecollection.hxx> @@ -134,7 +134,7 @@ uno::Reference< io::XInputStream > createTempInpStreamFromStor( uno::Reference< io::XInputStream > xResult; - uno::Reference < io::XStream > xTempStream( io::TempFile::create(comphelper::ComponentContext(xFactory).getUNOContext()), + uno::Reference < io::XStream > xTempStream( io::TempFile::create(comphelper::getComponentContext(xFactory)), uno::UNO_QUERY_THROW ); uno::Reference < lang::XSingleServiceFactory > xStorageFactory( @@ -585,7 +585,7 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr const ::rtl::OUString& aHierarchName ) { uno::Reference < io::XOutputStream > xTempOut( - io::TempFile::create(comphelper::ComponentContext(m_xFactory).getUNOContext()), + io::TempFile::create(comphelper::getComponentContext(m_xFactory)), uno::UNO_QUERY_THROW ); uno::Reference< io::XInputStream > aResult( xTempOut, uno::UNO_QUERY ); |