diff options
| author | Noel Grandin <noel@peralex.com> | 2015-06-29 10:11:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-06-29 10:11:53 +0200 |
| commit | b55166d266f31caf7bd85e54a59c7e8b49204b16 (patch) | |
| tree | f4d98e90c214a6e588e2b4e22c05b9c0f44309aa /include | |
| parent | 39fd37f39db37a83c4a1491d68518e721b04fc5f (diff) | |
Revert "return and use std::vector from OInterfaceContainerHelper"
This reverts commit e57314f61f67b093510c5a8a8f34a62126ba8734.
Diffstat (limited to 'include')
| -rw-r--r-- | include/cppuhelper/interfacecontainer.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index 74338f6074fd..a29eba04e752 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -47,7 +47,7 @@ namespace detail { */ union element_alias { - std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > *pAsVector; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > *pAsSequence; ::com::sun::star::uno::XInterface * pAsInterface; element_alias() : pAsInterface(0) {} }; @@ -155,18 +155,10 @@ public: */ sal_Int32 SAL_CALL getLength() const; -#ifdef LIBO_INTERNAL_ONLY /** Return all interfaces added to this container. - @since LibreOffice 5.1 - Not exposed because std::vector is problematic for an ABI **/ - std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getElementsAsVector() const; -#endif - /** - Return all interfaces added to this container. - **/ - css::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getElements() const; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getElements() const; /** Inserts an element into the container. The position is not specified, thus it is not specified in which order events are fired. @@ -244,14 +236,14 @@ public: private: friend class OInterfaceIteratorHelper; /** - bIsList == TRUE -> aData.pAsVector of type std::vector< XInterface >, + bIsList == TRUE -> aData.pAsSequence of type Sequence< XInterfaceSequence >, otherwise aData.pAsInterface == of type (XEventListener *) */ detail::element_alias aData; ::osl::Mutex & rMutex; /** TRUE -> used by an iterator. */ sal_Bool bInUse; - /** TRUE -> aData.pAsVector is of type std::vector< XInterface >. */ + /** TRUE -> aData.pAsSequence is of type Sequence< XInterfaceSequence >. */ sal_Bool bIsList; OInterfaceContainerHelper( const OInterfaceContainerHelper & ) |