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 /svtools/source/misc | |
| parent | e8a169c93d7e2443a2e56afe7e99cd0721a2c27b (diff) | |
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up.
Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/acceleratorexecute.cxx | 8 | ||||
| -rw-r--r-- | svtools/source/misc/imageresourceaccess.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 8351bf147454..bbaa4247029c 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <toolkit/helper/vclunohelper.hxx> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> @@ -389,7 +389,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st const css::uno::Reference< css::frame::XFrame >& xFrame) { css::uno::Reference< css::frame::XModuleManager2 > xModuleDetection( - css::frame::ModuleManager::create(comphelper::ComponentContext(xSMGR).getUNOContext())); + css::frame::ModuleManager::create(comphelper::getComponentContext(xSMGR))); ::rtl::OUString sModule; try @@ -402,7 +402,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st { return css::uno::Reference< css::ui::XAcceleratorConfiguration >(); } css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUISupplier( - css::ui::ModuleUIConfigurationManagerSupplier::create(comphelper::ComponentContext(xSMGR).getUNOContext()) ); + css::ui::ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(xSMGR)) ); css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg; try @@ -442,7 +442,7 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge // <- SAFE ---------------------------------- css::uno::Reference< css::util::XURLTransformer > xParser( - css::util::URLTransformer::create( ::comphelper::ComponentContext(xSMGR).getUNOContext() ) ); + css::util::URLTransformer::create( ::comphelper::getComponentContext(xSMGR) ) ); // SAFE -> ---------------------------------- aLock.reset(); diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index b34eea012426..65494581997e 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -38,7 +38,7 @@ #include <tools/stream.hxx> #include <unotools/streamwrap.hxx> #include <cppuhelper/implbase2.hxx> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> //........................................................................ namespace svt @@ -154,7 +154,7 @@ namespace svt try { // get a GraphicProvider - Reference< XGraphicProvider > xProvider = ::com::sun::star::graphic::GraphicProvider::create(comphelper::ComponentContext(_rxORB).getUNOContext()); + Reference< XGraphicProvider > xProvider = ::com::sun::star::graphic::GraphicProvider::create(comphelper::getComponentContext(_rxORB)); // let it create a graphic from the given URL Sequence< PropertyValue > aMediaProperties( 1 ); |