diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-28 16:36:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-01 11:48:54 +0100 |
| commit | d559c28e9e65f3be415ec2e36ee90aa147e65b84 (patch) | |
| tree | ccd15359825537da4ae46d80539652e25fc12bac /include/toolkit | |
| parent | b4f9ce195f57a826a56983130ef1920a717797fa (diff) | |
expand out IMPL_XTYPEPROVIDER_START macro
and make cppu::OTypeCollection::getTypes be const
Change-Id: I2dd1c0bacb2e1872f8b7a0da72f73013b04bef3c
Reviewed-on: https://gerrit.libreoffice.org/68536
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/toolkit')
| -rw-r--r-- | include/toolkit/awt/vclxwindows.hxx | 3 | ||||
| -rw-r--r-- | include/toolkit/helper/macros.hxx | 12 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 6c6288975fb8..025238ecedbe 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -338,7 +338,6 @@ public: void SAL_CALL release() throw() override { OWeakObject::release(); } // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // css::awt::XView @@ -407,7 +406,6 @@ public: void SAL_CALL release() throw() override { OWeakObject::release(); } // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // css::awt::XView @@ -438,7 +436,6 @@ public: void SAL_CALL release() throw() override { OWeakObject::release(); } // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // css::lang::XComponent diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index fc20ee8c0009..d06988b18fde 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -56,18 +56,6 @@ css::uno::Sequence< sal_Int8 > ClassName::getImplementationId() \ return css::uno::Sequence<sal_Int8>(); \ } -#define IMPL_XTYPEPROVIDER_START( ClassName ) \ -IMPL_IMPLEMENTATION_ID( ClassName ) \ -css::uno::Sequence< css::uno::Type > ClassName::getTypes() \ -{ \ - static ::cppu::OTypeCollection collection( \ - cppu::UnoType<css::lang::XTypeProvider>::get(), - -#define IMPL_XTYPEPROVIDER_END \ - ); \ - return collection.getTypes(); \ -} - #define DECL_LISTENERMULTIPLEXER_START( ClassName, InterfaceName ) \ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ |