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 /toolkit/source/controls/dialogcontrol.cxx | |
| 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 'toolkit/source/controls/dialogcontrol.cxx')
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 67c2afb54ee6..e163b832c3d1 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -734,13 +734,19 @@ void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListe maTabListeners.removeInterface( Listener ); } +IMPL_IMPLEMENTATION_ID( UnoMultiPageControl ) // lang::XTypeProvider -IMPL_XTYPEPROVIDER_START( UnoMultiPageControl ) - cppu::UnoType<awt::XSimpleTabController>::get(), - cppu::UnoType<awt::XTabListener>::get(), - ControlContainerBase::getTypes() -IMPL_XTYPEPROVIDER_END +css::uno::Sequence< css::uno::Type > UnoMultiPageControl::getTypes() +{ + static const ::cppu::OTypeCollection aTypeList( + cppu::UnoType<css::lang::XTypeProvider>::get(), + cppu::UnoType<awt::XSimpleTabController>::get(), + cppu::UnoType<awt::XTabListener>::get(), + ControlContainerBase::getTypes() + ); + return aTypeList.getTypes(); +} // uno::XInterface uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) |