diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-27 15:16:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-03-07 08:23:39 +0200 |
| commit | a3bb733ec6c6af04041c0b2a9849df22c26b3d29 (patch) | |
| tree | 4eebd3cafbed5f1d401afcb378928bed7781f072 /scripting/source/dlgprov | |
| parent | cd8ea20aa4b85128956a79c80f7953d30e99e802 (diff) | |
fdo#46808, Convert singleton theMasterScriptProviderFactory
Change-Id: I647a02e552acdd354463fc46c13c5a73b1c90d09
Diffstat (limited to 'scripting/source/dlgprov')
| -rw-r--r-- | scripting/source/dlgprov/dlgevtatt.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 0a82096c1741..1d87b50a7569 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/script/XScriptEventsSupplier.hpp> #include <com/sun/star/script/provider/XScriptProvider.hpp> -#include <com/sun/star/script/provider/XScriptProviderFactory.hpp> +#include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/script/vba/XVBACompatibility.hpp> #include <com/sun/star/lang/NoSuchMethodException.hpp> @@ -485,17 +485,12 @@ namespace dlgprov OSL_ASSERT( m_xContext.is() ); if ( m_xContext.is() ) { - Reference< provider::XScriptProviderFactory > xFactory( - m_xContext->getValueByName( - ::rtl::OUString("/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory") ), - UNO_QUERY ); - OSL_ENSURE( xFactory.is(), "SFURL_firing_impl: failed to get master script provider factory" ); - if ( xFactory.is() ) - { - Any aCtx; - aCtx <<= ::rtl::OUString("user"); - xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY ); - } + Reference< provider::XScriptProviderFactory > xFactory = + provider::theMasterScriptProviderFactory::get( m_xContext ); + + Any aCtx; + aCtx <<= ::rtl::OUString("user"); + xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY ); } } |