mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS scriptingf4 (1.7.4); FILE MERGED

Browse Source 
2004/05/06 12:47:20 npower 1.7.4.1: #i28812# Adding support for new MasterScriptProviderFactory service.
MasterScriptProvider no longer aggregates the browsenodes of all other MasterScriptProviders ( was a bad idea anyway ). This function is now performed by the standalone singleton css:script:browse::theBrowseNodeFactory which will aggregate the nodes, merge nodes from various languages and also sort them
Issue number:
Submitted by:
Reviewed by:
This commit is contained in:
Rüdiger Timm
2004-05-19 07:28:24 +00:00
parent 76553ab242
commit e859ea358a
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripting/source/provider/MasterScriptProvider.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: MasterScriptProvider.hxx,v $ * $RCSfile: MasterScriptProvider.hxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: svesik $ $Date: 2004-04-19 23:16:21 $ * last change: $Author: rt $ $Date: 2004-05-19 08:28:24 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -79,10 +79,11 @@ namespace func_provider
#define css ::com::sun::star #define css ::com::sun::star
#define dcsss ::drafts::com::sun::star::script #define dcsss ::drafts::com::sun::star::script
class MasterScriptProvider : typedef ::cppu::WeakImplHelper4<
public ::cppu::WeakImplHelper4 < dcsss::provider::XScriptProvider, dcsss::provider::XScriptProvider,
dcsss::browse::XBrowseNode, css::lang::XServiceInfo, dcsss::browse::XBrowseNode, css::lang::XServiceInfo,
css::lang::XInitialization > css::lang::XInitialization > t_helper;
class MasterScriptProvider : public t_helper
{ {
public: public:
MasterScriptProvider( MasterScriptProvider(
@@ -129,6 +130,8 @@ public:
css::uno::Sequence< css::uno::Reference< dcsss::provider::XScriptProvider > > SAL_CALL css::uno::Sequence< css::uno::Reference< dcsss::provider::XScriptProvider > > SAL_CALL
getAllProviders() throw ( css::uno::RuntimeException ); getAllProviders() throw ( css::uno::RuntimeException );
private: private:
::rtl::OUString parseLocationName( const ::rtl::OUString& location );
void createPkgProvider();
bool isValid(); bool isValid();
const css::uno::Sequence< ::rtl::OUString >& getProviderNames(); const css::uno::Sequence< ::rtl::OUString >& getProviderNames();
@@ -138,6 +141,7 @@ private:
css::uno::Reference< css::lang::XMultiComponentFactory > m_xMgr; css::uno::Reference< css::lang::XMultiComponentFactory > m_xMgr;
css::uno::Reference< css::frame::XModel > m_xModel; css::uno::Reference< css::frame::XModel > m_xModel;
css::uno::Sequence< css::uno::Any > m_sAargs; css::uno::Sequence< css::uno::Any > m_sAargs;
::rtl::OUString m_sNodeName;
// This component supports XInitialization, it can be created // This component supports XInitialization, it can be created
// using createInstanceXXX() or createInstanceWithArgumentsXXX using // using createInstanceXXX() or createInstanceWithArgumentsXXX using
// the service Mangager. // the service Mangager.
@@ -152,6 +156,7 @@ private:
css::uno::Reference< css::beans::XPropertySet > m_XScriptingContext; css::uno::Reference< css::beans::XPropertySet > m_XScriptingContext;
ProviderCache* m_pPCache; ProviderCache* m_pPCache;
osl::Mutex m_mutex; osl::Mutex m_mutex;
::rtl::OUString m_sCtxString;
}; };
} // namespace func_provider } // namespace func_provider
#endif //_FRAMEWORK_SCRIPT_PROVIDER_XFUNCTIONPROVIDER_HXX_ #endif //_FRAMEWORK_SCRIPT_PROVIDER_XFUNCTIONPROVIDER_HXX_