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>

1 files changed, 58 insertions, 23 deletions

diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 26da30676da4..46a53d2c0fc1 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -194,13 +194,20 @@ css::uno::Any VCLXMultiLineEdit::queryInterface( const css::uno::Type & rType )
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
+IMPL_IMPLEMENTATION_ID( VCLXMultiLineEdit )
+
 // css::lang::XTypeProvider
-IMPL_XTYPEPROVIDER_START( VCLXMultiLineEdit )
-    cppu::UnoType<css::awt::XTextComponent>::get(),
-    cppu::UnoType<css::awt::XTextArea>::get(),
-    cppu::UnoType<css::awt::XTextLayoutConstrains>::get(),
-    VCLXWindow::getTypes()
-IMPL_XTYPEPROVIDER_END
+css::uno::Sequence< css::uno::Type > VCLXMultiLineEdit::getTypes()
+{
+    static const ::cppu::OTypeCollection aTypeList(
+        cppu::UnoType<css::lang::XTypeProvider>::get(),
+        cppu::UnoType<css::awt::XTextComponent>::get(),
+        cppu::UnoType<css::awt::XTextArea>::get(),
+        cppu::UnoType<css::awt::XTextLayoutConstrains>::get(),
+        VCLXWindow::getTypes()
+    );
+    return aTypeList.getTypes();
+}
 
 void VCLXMultiLineEdit::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l )
 {
@@ -556,12 +563,19 @@ css::uno::Any VCLXFileControl::queryInterface( const css::uno::Type & rType )
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
+IMPL_IMPLEMENTATION_ID( VCLXFileControl )
+
 // css::lang::XTypeProvider
-IMPL_XTYPEPROVIDER_START( VCLXFileControl )
-    cppu::UnoType<css::awt::XTextComponent>::get(),
-    cppu::UnoType<css::awt::XTextLayoutConstrains>::get(),
-    VCLXWindow::getTypes()
-IMPL_XTYPEPROVIDER_END
+css::uno::Sequence< css::uno::Type > VCLXFileControl::getTypes()
+{
+    static const ::cppu::OTypeCollection aTypeList(
+        cppu::UnoType<css::lang::XTypeProvider>::get(),
+        cppu::UnoType<css::awt::XTextComponent>::get(),
+        cppu::UnoType<css::awt::XTextLayoutConstrains>::get(),
+        VCLXWindow::getTypes()
+    );
+    return aTypeList.getTypes();
+}
 
 void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
 {
@@ -1653,11 +1667,18 @@ css::uno::Any SVTXNumericField::queryInterface( const css::uno::Type & rType )
     return (aRet.hasValue() ? aRet : SVTXFormattedField::queryInterface( rType ));
 }
 
+IMPL_IMPLEMENTATION_ID( SVTXNumericField )
+
 // css::lang::XTypeProvider
-IMPL_XTYPEPROVIDER_START( SVTXNumericField )
-    cppu::UnoType<css::awt::XNumericField>::get(),
-    SVTXFormattedField::getTypes()
-IMPL_XTYPEPROVIDER_END
+css::uno::Sequence< css::uno::Type > SVTXNumericField::getTypes()
+{
+    static const ::cppu::OTypeCollection aTypeList(
+        cppu::UnoType<css::lang::XTypeProvider>::get(),
+        cppu::UnoType<css::awt::XNumericField>::get(),
+        SVTXFormattedField::getTypes()
+    );
+    return aTypeList.getTypes();
+}
 
 
 void SVTXNumericField::setValue( double Value )
@@ -1820,11 +1841,18 @@ css::uno::Any SVTXCurrencyField::queryInterface( const css::uno::Type & rType )
     return (aRet.hasValue() ? aRet : SVTXFormattedField::queryInterface( rType ));
 }
 
+IMPL_IMPLEMENTATION_ID( SVTXCurrencyField )
+
 // css::lang::XTypeProvider
-IMPL_XTYPEPROVIDER_START( SVTXCurrencyField )
-    cppu::UnoType<css::awt::XCurrencyField>::get(),
-    SVTXFormattedField::getTypes()
-IMPL_XTYPEPROVIDER_END
+css::uno::Sequence< css::uno::Type > SVTXCurrencyField::getTypes()
+{
+    static const ::cppu::OTypeCollection aTypeList(
+        cppu::UnoType<css::lang::XTypeProvider>::get(),
+        cppu::UnoType<css::awt::XCurrencyField>::get(),
+        SVTXFormattedField::getTypes()
+    );
+    return aTypeList.getTypes();
+}
 
 void SVTXCurrencyField::setValue( double Value )
 {
@@ -2108,11 +2136,18 @@ css::uno::Any VCLXProgressBar::queryInterface( const css::uno::Type & rType )
     return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
 }
 
+IMPL_IMPLEMENTATION_ID( VCLXProgressBar )
+
 // css::lang::XTypeProvider
-IMPL_XTYPEPROVIDER_START( VCLXProgressBar )
-    cppu::UnoType<css::awt::XProgressBar>::get(),
-    VCLXWindow::getTypes()
-IMPL_XTYPEPROVIDER_END
+css::uno::Sequence< css::uno::Type > VCLXProgressBar::getTypes()
+{
+    static const ::cppu::OTypeCollection aTypeList(
+        cppu::UnoType<css::lang::XTypeProvider>::get(),
+        cppu::UnoType<css::awt::XProgressBar>::get(),
+        VCLXWindow::getTypes()
+    );
+    return aTypeList.getTypes();
+}
 
 // css::awt::XProgressBar
 void VCLXProgressBar::setForegroundColor( sal_Int32 nColor )