diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-27 11:00:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-28 13:06:18 +0100 |
| commit | 7470cc532fe408dc9d8735cde0e2eb5bb62fd69c (patch) | |
| tree | 3815c10cbd2473a19915d8057ca1eb19046592bc /svx/source | |
| parent | 56ea15091c69d280310aa8b28bb1e9488eaad756 (diff) | |
fdo#46808, Adapt reflection::ProxyFactory UNO service to new style
The service is deprecated, but we still have a handful of in-tree
users, and converting it lets me thread XComponentContext through
a bunch of classes.
Change-Id: Iffdfe537ada6b9e4a89f9b3c8dd82ca85f4bfaba
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 279e9f25bff3..31b7471f1104 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/form/FormComponentType.hpp> -#include <com/sun/star/reflection/XProxyFactory.hpp> +#include <com/sun/star/reflection/ProxyFactory.hpp> #include <com/sun/star/container/XContainer.hpp> #include <comphelper/processfactory.hxx> #include <unotools/accessiblestatesethelper.hxx> @@ -123,7 +123,7 @@ AccessibleControlShape::AccessibleControlShape ( , m_bDisposeNativeContext( sal_False ) , m_bWaitingForControl( sal_False ) { - m_pChildManager = new OWrappedAccessibleChildrenManager( getProcessServiceFactory() ); + m_pChildManager = new OWrappedAccessibleChildrenManager( getProcessComponentContext() ); m_pChildManager->acquire(); osl_atomic_increment( &m_refCount ); @@ -260,11 +260,9 @@ void AccessibleControlShape::Init() // ................................................................. // finally, aggregate a proxy for the control context // first a factory for the proxy - Reference< XProxyFactory > xFactory; - xFactory = xFactory.query( getProcessServiceFactory()->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.reflection.ProxyFactory" ) ) ) ); - OSL_ENSURE( xFactory.is(), "AccessibleControlShape::Init: could not create a proxy factory!" ); + Reference< XProxyFactory > xFactory = ProxyFactory::create( comphelper::getComponentContext(getProcessServiceFactory()) ); // then the proxy itself - if ( xFactory.is() && xNativeControlContext.is() ) + if ( xNativeControlContext.is() ) { m_xControlContextProxy = xFactory->createProxy( xNativeControlContext ); OSL_VERIFY( xNativeControlContext->queryInterface( ::getCppuType( &m_xControlContextTypeAccess ) ) >>= m_xControlContextTypeAccess ); |