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 /sw | |
| parent | e8a169c93d7e2443a2e56afe7e99cd0721a2c27b (diff) | |
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up.
Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 11 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 5 |
2 files changed, 1 insertions, 15 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index e1061c087d0f..c71bae931b7d 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -53,7 +53,6 @@ #include <svx/svdoole2.hxx> #include <editeng/editeng.hxx> #include <editeng/flditem.hxx> -#include <comphelper/seqstream.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svx/fmglob.hxx> #include <svx/svdouno.hxx> @@ -97,10 +96,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/XFormComponent.hpp> -#include <comphelper/processfactory.hxx> #include "docsh.hxx" #include <oox/ole/olehelper.hxx> -#include <comphelper/componentcontext.hxx> #include <fstream> #include <unotools/streamwrap.hxx> @@ -2773,14 +2770,6 @@ sal_uInt32 SwEscherEx::QueryTextID( return nId; } -uno::Reference< uno::XComponentContext > -lcl_getUnoCtx() -{ - comphelper::ComponentContext aCtx( ::comphelper::getProcessServiceFactory() ); - return aCtx.getUNOContext(); -} - - SwMSConvertControls::SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP ) : oox ::ole::MSConvertOCXControls( pDSh ? pDSh->GetModel() : NULL ), pPaM( pP ) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index dc89f507a0f6..5fc820f5e37c 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -132,8 +132,6 @@ using namespace nsHdFtFlags; #include <comphelper/mediadescriptor.hxx> #include <oox/ole/vbaproject.hxx> #include <oox/ole/olestorage.hxx> -#include <comphelper/componentcontext.hxx> - using ::comphelper::MediaDescriptor; using ::comphelper::getProcessServiceFactory; @@ -145,8 +143,7 @@ class BasicProjImportHelper public: BasicProjImportHelper( SwDocShell& rShell ) : mrDocShell( rShell ) { - comphelper::ComponentContext aCtx( ::comphelper::getProcessServiceFactory() ); - mxCtx = aCtx.getUNOContext(); + mxCtx = comphelper::getProcessComponentContext(); } bool import( const uno::Reference< io::XInputStream >& rxIn ); rtl::OUString getProjectName(); |