diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-08-12 11:18:04 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-08-12 11:18:04 +0000 |
| commit | 2387b2fd16128f08dfcf5af48eb5084eb21e25a8 (patch) | |
| tree | 219caaf402d222ba1657e07692e17c30deedb466 | |
| parent | fd813ea19e7bec566e78ab1ec5bde2b84d7f4f8c (diff) | |
INTEGRATION: CWS unotlc (1.4.32); FILE MERGED
2004/07/12 13:30:04 dbo 1.4.32.1: #i20303# fixing resolve order: first tdmgr, then local provider
| -rw-r--r-- | stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx index 03e0fcc77..6c0b88ef8 100644 --- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx +++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx @@ -2,9 +2,9 @@ * * $RCSfile: rdbtdp_tdenumeration.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-03-30 16:15:39 $ + * last change: $Author: obo $ $Date: 2004-08-12 12:18:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,7 +115,7 @@ class TypeDescriptionEnumerationImpl public: static rtl::Reference< TypeDescriptionEnumerationImpl > createInstance( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, + ::com::sun::star::container::XHierarchicalNameAccess > & xTDMgr, const rtl::OUString & rModuleName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::TypeClass > & rTypes, @@ -146,7 +146,7 @@ private: // Note: keys must be open (XRegistryKey->openKey(...)). TypeDescriptionEnumerationImpl( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & xContext, + ::com::sun::star::container::XHierarchicalNameAccess > & xTDMgr, const RegistryKeyList & rModuleKeys, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::TypeClass > & rTypes, @@ -157,8 +157,6 @@ private: bool queryMore(); ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XTypeDescription > queryNext(); - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XHierarchicalNameAccess > getTDMgr(); // members osl::Mutex m_aMutex; @@ -168,8 +166,6 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::TypeClass > m_aTypes; ::com::sun::star::reflection::TypeDescriptionSearchDepth m_eDepth; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > m_xTDMgr; }; |