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 /uui | |
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 'uui')
-rw-r--r-- | uui/source/iahndl-authentication.cxx | 4 | ||||
-rw-r--r-- | uui/source/passwordcontainer.cxx | 4 | ||||
-rw-r--r-- | uui/source/sslwarndlg.cxx | 4 | ||||
-rw-r--r-- | uui/source/unknownauthdlg.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 6e03e22f1b04..bf09e7e3e1d1 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "comphelper/componentcontext.hxx" +#include "comphelper/processfactory.hxx" #include "com/sun/star/task/DocumentPasswordRequest.hpp" #include "com/sun/star/task/DocumentPasswordRequest2.hpp" @@ -206,7 +206,7 @@ handleAuthenticationRequest_( ////////////////////////// // First, try to obtain credentials from password container service. - uui::PasswordContainerHelper aPwContainerHelper(comphelper::ComponentContext(xServiceFactory).getUNOContext()); + uui::PasswordContainerHelper aPwContainerHelper(comphelper::getComponentContext(xServiceFactory)); if (aPwContainerHelper.handleAuthenticationRequest(rRequest, xSupplyAuthentication, rURL, diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index 546d795bded4..5a688c622197 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "comphelper/componentcontext.hxx" +#include "comphelper/processfactory.hxx" #include "cppuhelper/factory.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" @@ -416,7 +416,7 @@ PasswordContainerInteractionHandler_CreateInstance( throw( uno::Exception ) { lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >( - new PasswordContainerInteractionHandler( comphelper::ComponentContext(rSMgr).getUNOContext() ) ); + new PasswordContainerInteractionHandler( comphelper::getComponentContext(rSMgr) ) ); return uno::Reference< uno::XInterface >::query( pX ); } diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index eba78e197b47..b00ca79fa160 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -23,7 +23,7 @@ #include <sslwarndlg.hrc> #include <sslwarndlg.hxx> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/security/DocumentDigitalSignatures.hpp> // ----------------------------------------------------------------------- @@ -40,7 +40,7 @@ IMPL_LINK_NOARG(SSLWarnDialog, ViewCertHdl_Impl) { uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; - xDocumentDigitalSignatures = ::com::sun::star::security::DocumentDigitalSignatures::createDefault( comphelper::ComponentContext(getServiceFactory()).getUNOContext() ); + xDocumentDigitalSignatures = ::com::sun::star::security::DocumentDigitalSignatures::createDefault( comphelper::getComponentContext(getServiceFactory()) ); xDocumentDigitalSignatures.get()->showCertificate(getCert()); diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index c53e5bb8d0bf..dc0e551ac163 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -22,7 +22,7 @@ #include <ids.hrc> #include <unknownauthdlg.hrc> #include <unknownauthdlg.hxx> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> #include <com/sun/star/security/DocumentDigitalSignatures.hpp> @@ -48,7 +48,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl) uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >( - ::com::sun::star::security::DocumentDigitalSignatures::createDefault(comphelper::ComponentContext(getServiceFactory()).getUNOContext()) ); + ::com::sun::star::security::DocumentDigitalSignatures::createDefault(comphelper::getComponentContext(getServiceFactory())) ); xDocumentDigitalSignatures.get()->showCertificate(getCert()); |