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 /offapi | |
parent | fdo#46808, Convert ui::UIConfigurationManager to new-style (diff) | |
download | core-a3bb733ec6c6af04041c0b2a9849df22c26b3d29.tar.gz core-a3bb733ec6c6af04041c0b2a9849df22c26b3d29.zip |
fdo#46808, Convert singleton theMasterScriptProviderFactory
Change-Id: I647a02e552acdd354463fc46c13c5a73b1c90d09
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/UnoApi_offapi.mk | 3 | ||||
-rw-r--r-- | offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl | 19 | ||||
-rw-r--r-- | offapi/com/sun/star/script/provider/theMasterScriptProviderFactory.idl | 43 |
3 files changed, 47 insertions, 18 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index d42358832600..99f19c46f1d0 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -268,6 +268,8 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\ DocumentScriptLibraryContainer \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\ + theMasterScriptProviderFactory \ + MasterScriptProviderFactory \ ScriptURIHelper \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\ @@ -989,7 +991,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\ LanguageScriptProvider \ MasterScriptProvider \ - MasterScriptProviderFactory \ ScriptProvider \ ScriptProviderForBasic \ ScriptProviderForBeanShell \ diff --git a/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl b/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl index 6d9fc848c332..1d5e0391f135 100644 --- a/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl +++ b/offapi/com/sun/star/script/provider/MasterScriptProviderFactory.idl @@ -29,25 +29,10 @@ module com { module sun { module star { module script { module provider { This service is used to create MasterScriptProviders. Note: You shouldn't ever instantiate the MasterScriptProvider service directly, you should always use this service. -*/ -service MasterScriptProviderFactory -{ - interface XScriptProviderFactory; -}; - -/** - The one and only MasterScriptProviderFactory - - To get the singleton call getValueByName on the component context - <pre> - /singletons/com.sun.star.script.provider.theMasterScriptProviderFactory - </pre> + @deprecated rather use the singleton service theMasterScriptProviderFactory */ -singleton theMasterScriptProviderFactory -{ - service MasterScriptProviderFactory; -}; +service MasterScriptProviderFactory : XScriptProviderFactory; }; }; }; }; }; diff --git a/offapi/com/sun/star/script/provider/theMasterScriptProviderFactory.idl b/offapi/com/sun/star/script/provider/theMasterScriptProviderFactory.idl new file mode 100644 index 000000000000..abf17375c5d1 --- /dev/null +++ b/offapi/com/sun/star/script/provider/theMasterScriptProviderFactory.idl @@ -0,0 +1,43 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef __com_sun_star_script_provider_theMasterScriptProviderFactory_idl__ +#define __com_sun_star_script_provider_theMasterScriptProviderFactory_idl__ + + +#include <com/sun/star/script/provider/XScriptProviderFactory.idl> + +module com { module sun { module star { module script { module provider { + +/** + The one and only MasterScriptProviderFactory + + To get the singleton call getValueByName on the component context + <pre> + /singletons/com.sun.star.script.provider.theMasterScriptProviderFactory + </pre> + +*/ +singleton theMasterScriptProviderFactory : XScriptProviderFactory; + +}; }; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |