diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-31 09:55:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-31 12:06:50 +0200 |
| commit | b02998a7cb86bb69c01fd7c2625c801eef835e55 (patch) | |
| tree | eaee008356bc6054b43844744e50d24756a53007 /include/vbahelper | |
| parent | c54850b23a8240a41755af171a6d3f990ee69f84 (diff) | |
inline some use-once typedefs
and remove some dead ones
Change-Id: I6946d717d3c15dc5207489ed3d56d985dd953d59
Reviewed-on: https://gerrit.libreoffice.org/41746
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vbahelper')
| -rw-r--r-- | include/vbahelper/vbacollectionimpl.hxx | 10 | ||||
| -rw-r--r-- | include/vbahelper/vbapropvalue.hxx | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 93e5e0e65ec9..db65f542dcb2 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -143,10 +143,10 @@ public: // only requirement is the object needs to implement XName -typedef ::cppu::WeakImplHelper< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE; - template< typename OneIfc > -class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE +class XNamedObjectCollectionHelper : public ::cppu::WeakImplHelper< css::container::XNameAccess, + css::container::XIndexAccess, + css::container::XEnumerationAccess > { public: typedef std::vector< css::uno::Reference< OneIfc > > XNamedVec; @@ -330,9 +330,7 @@ public: }; -typedef ::cppu::WeakImplHelper<ov::XCollection> XCollection_InterfacesBASE; - -typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase; +typedef ScVbaCollectionBase< ::cppu::WeakImplHelper<ov::XCollection> > CollImplBase; // compatible with the old collections ( pre XHelperInterface base class ) ( some internal objects still use this ) class VBAHELPER_DLLPUBLIC ScVbaCollectionBaseImpl : public CollImplBase { diff --git a/include/vbahelper/vbapropvalue.hxx b/include/vbahelper/vbapropvalue.hxx index 23d9d3e743aa..0ea4417595d7 100644 --- a/include/vbahelper/vbapropvalue.hxx +++ b/include/vbahelper/vbapropvalue.hxx @@ -30,8 +30,6 @@ #include <vbahelper/vbadllapi.h> #include <vbahelper/vbahelper.hxx> -typedef ::cppu::WeakImplHelper< ov::XPropValue > PropValueImpl_BASE; - class VBAHELPER_DLLPUBLIC PropListener { public: @@ -43,7 +41,7 @@ protected: }; -class VBAHELPER_DLLPUBLIC ScVbaPropValue : public PropValueImpl_BASE +class VBAHELPER_DLLPUBLIC ScVbaPropValue : public ::cppu::WeakImplHelper< ov::XPropValue > { PropListener* m_pListener; public: |