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 /basic | |
| parent | cd8ea20aa4b85128956a79c80f7953d30e99e802 (diff) | |
fdo#46808, Convert singleton theMasterScriptProviderFactory
Change-Id: I647a02e552acdd354463fc46c13c5a73b1c90d09
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/eventatt.cxx | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 6201a752c8dd..7dfa94ba022e 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -22,30 +22,29 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> +#include <com/sun/star/awt/XControlContainer.hpp> +#include <com/sun/star/awt/XControlModel.hpp> +#include <com/sun/star/awt/XControl.hpp> +#include <com/sun/star/awt/XDialog.hpp> +#include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/awt/XDialogProvider.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/container/XEnumerationAccess.hpp> +#include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/resource/XStringResourceSupplier.hpp> +#include <com/sun/star/resource/XStringResourceManager.hpp> #include <com/sun/star/script/XEventAttacher.hpp> #include <com/sun/star/script/XAllListener.hpp> #include <com/sun/star/script/XScriptEventsSupplier.hpp> #include <com/sun/star/script/XScriptEventsAttacher.hpp> #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/resource/XStringResourceSupplier.hpp> -#include <com/sun/star/resource/XStringResourceManager.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> -#include <com/sun/star/awt/XControlModel.hpp> -#include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/awt/XDialog.hpp> -#include <com/sun/star/awt/XWindow.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/provider/XScriptProvider.hpp> -#include <com/sun/star/awt/XDialogProvider.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> #include <basic/basicmanagerrepository.hxx> #include <basic/basmgr.hxx> //================================================================================================== @@ -93,16 +92,12 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, Any* pRet, const Refere { Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); - Reference< provider::XScriptProviderFactory > xFactory( - xContext->getValueByName( - 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 <<= OUString("user"); - xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY ); - } + Reference< provider::XScriptProviderFactory > xFactory = + provider::theMasterScriptProviderFactory::get( xContext ); + + Any aCtx; + aCtx <<= OUString("user"); + xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY ); } if ( !xScriptProvider.is() ) |