diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-10-22 13:07:52 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-10-22 13:07:52 +0000 |
| commit | 6dd903801b794dfafeb97f5ae41ebaae969dd26b (patch) | |
| tree | 5837b79430149de7cfab5449783bae2b06a6a199 /scripting | |
| parent | 1eb4a089a3ebf467c02342c83d7f7d17c56be52e (diff) | |
INTEGRATION: CWS scriptingf6 (1.4.2); FILE MERGED
2004/10/11 10:07:57 toconnor 1.4.2.2: RESYNC: (1.4-1.5); FILE MERGED
2004/08/03 14:45:06 dfoster 1.4.2.1: #i32502#
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/provider/ProviderCache.hxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index cf9c36a67419..14ba490d2d86 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ProviderCache.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-09-08 13:58:22 $ + * last change: $Author: rt $ $Date: 2004-10-22 14:07:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,7 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <drafts/com/sun/star/script/provider/XScriptProvider.hpp> +#include <com/sun/star/script/provider/XScriptProvider.hpp> #include "ScriptingContext.hxx" @@ -81,7 +81,6 @@ namespace func_provider { // for simplification #define css ::com::sun::star -#define dcsss ::drafts::com::sun::star::script //Typedefs //============================================================================= @@ -90,7 +89,7 @@ struct ProviderDetails { //css::uno::Reference< css::lang::XSingleServiceFactory > factory; css::uno::Reference< css::lang::XSingleComponentFactory > factory; - css::uno::Reference< dcsss::provider::XScriptProvider > provider; + css::uno::Reference< css::script::provider::XScriptProvider > provider; }; typedef ::std::hash_map < ::rtl::OUString, ProviderDetails , ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > ProviderDetails_hash; @@ -106,15 +105,15 @@ public: const css::uno::Sequence< ::rtl::OUString >& blackList ) throw ( css::uno::RuntimeException ); ~ProviderCache(); - css::uno::Reference< dcsss::provider::XScriptProvider > + css::uno::Reference< css::script::provider::XScriptProvider > getProvider( const ::rtl::OUString& providerName ); - css::uno::Sequence < css::uno::Reference< dcsss::provider::XScriptProvider > > + css::uno::Sequence < css::uno::Reference< css::script::provider::XScriptProvider > > getAllProviders() throw ( css::uno::RuntimeException ); private: void populateCache() throw ( css::uno::RuntimeException ); - css::uno::Reference< dcsss::provider::XScriptProvider > + css::uno::Reference< css::script::provider::XScriptProvider > createProvider( ProviderDetails& details ) throw ( css::uno::RuntimeException ); bool isInBlackList( const ::rtl::OUString& serviceName ) { |