diff options
| author | Noel Grandin <noel@peralex.com> | 2012-08-21 10:30:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-27 15:40:07 +0200 |
| commit | 7634d064adc2c773288cec751674ff691de20b2b (patch) | |
| tree | 5aeb2af9756642c9507a68212cf772346c8f136d | |
| parent | 8638f1e72a3fe830c0e8dcc1bd847d4fb9e599ee (diff) | |
fdo#46808, Adapt UNO service registry::ImplementationRegistration
Change-Id: I77d28e7575e18e682f8360f6e416954dfb7a4e30
| -rw-r--r-- | remotebridges/examples/officeclient.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/app/unohelp.cxx | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx index d99b7837c096..c672dd8463c6 100644 --- a/remotebridges/examples/officeclient.cxx +++ b/remotebridges/examples/officeclient.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/XNamingService.hpp> -#include <com/sun/star/registry/XImplementationRegistration.hpp> +#include <com/sun/star/registry/ImplementationRegistration.hpp> #include <com/sun/star/connection/XConnector.hpp> @@ -94,10 +94,7 @@ void OfficeClientMain::registerServices( ) // register services. // Note : this needs to be done only once and is in general done by the setup Reference < XImplementationRegistration > rImplementationRegistration( - - m_xSMgr->createInstance( - OUString("com.sun.star.registry.ImplementationRegistration")), - UNO_QUERY ); + ImplementationRegistration::create(m_xSMgr) ); if( ! rImplementationRegistration.is() ) { diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index 52f44171ad7c..3b144f52668c 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -41,13 +41,14 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/componentcontext.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/awt/XExtendedToolkit.hpp> #include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <com/sun/star/registry/XImplementationRegistration.hpp> +#include <com/sun/star/registry/ImplementationRegistration.hpp> using namespace ::com::sun::star; @@ -101,7 +102,7 @@ uno::Reference< lang::XMultiServiceFactory > vcl::unohelper::GetMultiServiceFact { pSVData->maAppData.mxMSF = ::cppu::createRegistryServiceFactory( aTempFileName, rtl::OUString(), sal_False ); uno::Reference < registry::XImplementationRegistration > xReg( - pSVData->maAppData.mxMSF->createInstance( OUString("com.sun.star.registry.ImplementationRegistration")), uno::UNO_QUERY ); + registry::ImplementationRegistration::create( comphelper::ComponentContext(pSVData->maAppData.mxMSF).getUNOContext() ) ); if( xReg.is() ) { |