simplify UNO getTypes methods

Change-Id: Ia8b07edec54527fb4904536fabb03a18e8452550
Reviewed-on: https://gerrit.libreoffice.org/68659
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

14 files changed, 90 insertions, 197 deletions

diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index f36b4f86691b..ac80522b1cb0 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -309,15 +309,9 @@ uno::Any SwAccessibleCell::queryInterface( const uno::Type& rType )
 // XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL SwAccessibleCell::getTypes()
 {
-    uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() );
-
-    sal_Int32 nIndex = aTypes.getLength();
-    aTypes.realloc( nIndex + 1 );
-
-    uno::Type* pTypes = aTypes.getArray();
-    pTypes[nIndex] = ::cppu::UnoType<XAccessibleValue>::get();
-
-    return aTypes;
+    return cppu::OTypeCollection(
+        ::cppu::UnoType<XAccessibleValue>::get(),
+        SwAccessibleContext::getTypes() ).getTypes();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId()
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 414c24968dc1..a88b9ee4fdba 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -469,15 +469,9 @@ uno::Any SwAccessibleDocument::queryInterface(
 // XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes()
 {
-    uno::Sequence< uno::Type > aTypes( SwAccessibleDocumentBase::getTypes() );
-
-    sal_Int32 nIndex = aTypes.getLength();
-    //Reset types memory alloc
-    aTypes.realloc( nIndex + 1 );
-
-    uno::Type* pTypes = aTypes.getArray();
-    pTypes[nIndex] = cppu::UnoType<XAccessibleSelection>::get();
-    return aTypes;
+    return cppu::OTypeCollection(
+            cppu::UnoType<XAccessibleSelection>::get(),
+            SwAccessibleDocumentBase::getTypes() ).getTypes();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId()
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index fbe78a96d170..b78e534ab4e0 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -216,15 +216,9 @@ uno::Any SAL_CALL SwAccessibleNoTextFrame::queryInterface( const uno::Type& aTyp
 
 uno::Sequence< uno::Type > SAL_CALL SwAccessibleNoTextFrame::getTypes()
 {
-    uno::Sequence< uno::Type > aTypes( SwAccessibleFrameBase::getTypes() );
-
-    sal_Int32 nIndex = aTypes.getLength();
-    aTypes.realloc( nIndex + 1 );
-
-    uno::Type* pTypes = aTypes.getArray();
-    pTypes[nIndex] = ::cppu::UnoType<XAccessibleImage>::get();
-
-    return aTypes;
+    return cppu::OTypeCollection(
+        ::cppu::UnoType<XAccessibleImage>::get(),
+        SwAccessibleFrameBase::getTypes() ).getTypes();
 }
 
 /// XAccessibleImage
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index ac2bb5a8c83c..3abbd7a60826 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1002,23 +1002,16 @@ uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType )
 // XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes()
 {
-    uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() );
-
-    sal_Int32 nIndex = aTypes.getLength();
     // #i63870# - add type accessibility::XAccessibleTextAttributes
     // #i89175# - add type accessibility::XAccessibleTextMarkup and
-    // accessibility::XAccessibleMultiLineText
-    aTypes.realloc( nIndex + 6 );
-
-    uno::Type* pTypes = aTypes.getArray();
-    pTypes[nIndex++] = cppu::UnoType<XAccessibleEditableText>::get();
-    pTypes[nIndex++] = cppu::UnoType<XAccessibleTextAttributes>::get();
-    pTypes[nIndex++] = ::cppu::UnoType<XAccessibleSelection>::get();
-    pTypes[nIndex++] = cppu::UnoType<XAccessibleTextMarkup>::get();
-    pTypes[nIndex++] = cppu::UnoType<XAccessibleMultiLineText>::get();
-    pTypes[nIndex] = cppu::UnoType<XAccessibleHypertext>::get();
-
-    return aTypes;
+    return cppu::OTypeCollection(
+            cppu::UnoType<XAccessibleEditableText>::get(),
+            cppu::UnoType<XAccessibleTextAttributes>::get(),
+            ::cppu::UnoType<XAccessibleSelection>::get(),
+            cppu::UnoType<XAccessibleTextMarkup>::get(),
+            cppu::UnoType<XAccessibleMultiLineText>::get(),
+            cppu::UnoType<XAccessibleHypertext>::get(),
+            SwAccessibleContext::getTypes() ).getTypes();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId()
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index d1cfb08c29c6..9df77fac8b9e 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -52,6 +52,7 @@
 #include <frmatr.hxx>
 
 #include <cppuhelper/supportsservice.hxx>
+#include <cppuhelper/typeprovider.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -775,16 +776,10 @@ uno::Any SwAccessibleTable::queryInterface( const uno::Type& rType )
 // XTypeProvider
 uno::Sequence< uno::Type > SAL_CALL SwAccessibleTable::getTypes()
 {
-    uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() );
-
-    sal_Int32 nIndex = aTypes.getLength();
-    aTypes.realloc( nIndex + 2 );
-
-    uno::Type* pTypes = aTypes.getArray();
-    pTypes[nIndex++] = cppu::UnoType<XAccessibleSelection>::get();
-    pTypes[nIndex++] = cppu::UnoType<XAccessibleTable>::get();
-
-    return aTypes;
+    return cppu::OTypeCollection(
+        cppu::UnoType<XAccessibleSelection>::get(),
+        cppu::UnoType<XAccessibleTable>::get(),
+        SwAccessibleContext::getTypes() ).getTypes();
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTable::getImplementationId()
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index f5100e240f50..d8be8a2b5b53 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -512,21 +512,10 @@ uno::Any SwXDrawPage::queryInterface( const uno::Type& aType )
 
 uno::Sequence< uno::Type > SwXDrawPage::getTypes()
 {
-    uno::Sequence< uno::Type > aPageTypes = SwXDrawPageBaseClass::getTypes();
-    uno::Sequence< uno::Type > aSvxTypes = GetSvxPage()->getTypes();
-
-    long nIndex = aPageTypes.getLength();
-    aPageTypes.realloc(aPageTypes.getLength() + aSvxTypes.getLength() + 1);
-
-    uno::Type* pPageTypes = aPageTypes.getArray();
-    const uno::Type* pSvxTypes = aSvxTypes.getConstArray();
-    long nPos;
-    for(nPos = 0; nPos < aSvxTypes.getLength(); nPos++)
-    {
-        pPageTypes[nIndex++] = pSvxTypes[nPos];
-    }
-    pPageTypes[nIndex] = cppu::UnoType<form::XFormsSupplier2>::get();
-    return aPageTypes;
+    return comphelper::concatSequences(
+                SwXDrawPageBaseClass::getTypes(),
+                GetSvxPage()->getTypes(),
+                uno::Sequence { cppu::UnoType<form::XFormsSupplier2>::get() });
 }
 
 sal_Int32 SwXDrawPage::getCount()
@@ -1015,15 +1004,7 @@ uno::Sequence< uno::Type > SwXShape::getTypes(  )
         {
             uno::Reference< XTypeProvider > xAggProv;
             aProv >>= xAggProv;
-            uno::Sequence< uno::Type > aAggTypes = xAggProv->getTypes();
-            const uno::Type* pAggTypes = aAggTypes.getConstArray();
-            long nIndex = aRet.getLength();
-
-            aRet.realloc(nIndex + aAggTypes.getLength());
-            uno::Type* pBaseTypes = aRet.getArray();
-
-            for(long i = 0; i < aAggTypes.getLength(); i++)
-                pBaseTypes[nIndex++] = pAggTypes[i];
+            return comphelper::concatSequences(aRet, xAggProv->getTypes());
         }
     }
     return aRet;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 01a9f3790bf4..63984f210c75 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3135,27 +3135,11 @@ void SAL_CALL SwXTextFrame::release(  )throw()
 
 uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes(  )
 {
-    uno::Sequence< uno::Type > aTextFrameTypes = SwXTextFrameBaseClass::getTypes();
-    uno::Sequence< uno::Type > aFrameTypes = SwXFrame::getTypes();
-    uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes();
-
-    long nIndex = aTextFrameTypes.getLength();
-    aTextFrameTypes.realloc(
-        aTextFrameTypes.getLength() +
-        aFrameTypes.getLength() +
-        aTextTypes.getLength());
-
-    uno::Type* pTextFrameTypes = aTextFrameTypes.getArray();
-    const uno::Type* pFrameTypes = aFrameTypes.getConstArray();
-    long nPos;
-    for(nPos = 0; nPos <aFrameTypes.getLength(); nPos++)
-        pTextFrameTypes[nIndex++] = pFrameTypes[nPos];
-
-    const uno::Type* pTextTypes = aTextTypes.getConstArray();
-    for(nPos = 0; nPos <aTextTypes.getLength(); nPos++)
-        pTextFrameTypes[nIndex++] = pTextTypes[nPos];
-
-    return aTextFrameTypes;
+    return comphelper::concatSequences(
+        SwXTextFrameBaseClass::getTypes(),
+        SwXFrame::getTypes(),
+        SwXText::getTypes()
+    );
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId(  )
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index c5492af982dd..b3f0f71d60de 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -82,15 +82,10 @@ uno::Any SwXRedlineText::queryInterface( const uno::Type& rType )
 
 uno::Sequence<uno::Type> SwXRedlineText::getTypes()
 {
-    // SwXText::getTypes()
-    uno::Sequence<uno::Type> aTypes = SwXText::getTypes();
-
-    // add container::XEnumerationAccess
-    sal_Int32 nLength = aTypes.getLength();
-    aTypes.realloc(nLength + 1);
-    aTypes[nLength] = cppu::UnoType<container::XEnumerationAccess>::get();
-
-    return aTypes;
+    return cppu::OTypeCollection(
+            cppu::UnoType<container::XEnumerationAccess>::get(),
+            SwXText::getTypes()
+        ).getTypes();
 }
 
 uno::Sequence<sal_Int8> SwXRedlineText::getImplementationId()
@@ -583,15 +578,10 @@ uno::Any SwXRedline::queryInterface( const uno::Type& rType )
 
 uno::Sequence<uno::Type> SwXRedline::getTypes()
 {
-    uno::Sequence<uno::Type> aTypes = SwXText::getTypes();
-    uno::Sequence<uno::Type> aBaseTypes = SwXRedlineBaseClass::getTypes();
-    const uno::Type* pBaseTypes = aBaseTypes.getConstArray();
-    sal_Int32 nCurType = aTypes.getLength();
-    aTypes.realloc(aTypes.getLength() + aBaseTypes.getLength());
-    uno::Type* pTypes = aTypes.getArray();
-    for(sal_Int32 nType = 0; nType < aBaseTypes.getLength(); nType++)
-        pTypes[nCurType++] = pBaseTypes[nType];
-    return aTypes;
+    return comphelper::concatSequences(
+            SwXText::getTypes(),
+            SwXRedlineBaseClass::getTypes()
+        );
 }
 
 uno::Sequence<sal_Int8> SwXRedline::getImplementationId()
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 2a3f9e228275..745f06e4ed44 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3324,11 +3324,10 @@ const SfxPoolItem* SwXFrameStyle::GetItem(sal_uInt16 eAtr)
 
 uno::Sequence<uno::Type> SwXFrameStyle::getTypes()
 {
-    uno::Sequence<uno::Type> aTypes = SwXStyle::getTypes();
-    sal_Int32 nLen = aTypes.getLength();
-    aTypes.realloc(nLen + 1);
-    aTypes[nLen] = cppu::UnoType<XEventsSupplier>::get();
-    return aTypes;
+    return cppu::OTypeCollection(
+            cppu::UnoType<XEventsSupplier>::get(),
+            SwXStyle::getTypes()
+        ).getTypes();
 }
 
 uno::Any SwXFrameStyle::queryInterface(const uno::Type& rType)
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 8b5405e53970..76c7597bbcd2 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -786,16 +786,10 @@ sal_Int64 SAL_CALL SwXCell::getSomething( const uno::Sequence< sal_Int8 >& rId )
 
 uno::Sequence< uno::Type > SAL_CALL SwXCell::getTypes(  )
 {
-    static uno::Sequence< uno::Type > aRetTypes = [&]()
-    {
-        const auto& rCellTypes = SwXCellBaseClass::getTypes();
-        const auto& rTextTypes = SwXText::getTypes();
-        auto tmp = uno::Sequence<uno::Type>(rCellTypes.getLength() + rTextTypes.getLength());
-        std::copy_n(rCellTypes.begin(), rCellTypes.getLength(), tmp.begin());
-        std::copy_n(rTextTypes.begin(), rTextTypes.getLength(), tmp.begin()+rCellTypes.getLength());
-        return tmp;
-    }();
-    return aRetTypes;
+    return comphelper::concatSequences(
+            SwXCellBaseClass::getTypes(),
+            SwXText::getTypes()
+        );
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwXCell::getImplementationId(  )
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 944851a47f2d..6caefea72e0f 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -262,22 +262,21 @@ SwXText::queryInterface(const uno::Type& rType)
 uno::Sequence< uno::Type > SAL_CALL
 SwXText::getTypes()
 {
-    uno::Sequence< uno::Type > aRet(12);
-    uno::Type* pTypes = aRet.getArray();
-    pTypes[0] = cppu::UnoType<text::XText>::get();
-    pTypes[1] = cppu::UnoType<text::XTextRangeCompare>::get();
-    pTypes[2] = cppu::UnoType<text::XRelativeTextContentInsert>::get();
-    pTypes[3] = cppu::UnoType<text::XRelativeTextContentRemove>::get();
-    pTypes[4] = cppu::UnoType<lang::XUnoTunnel>::get();
-    pTypes[5] = cppu::UnoType<beans::XPropertySet>::get();
-    pTypes[6] = cppu::UnoType<text::XTextPortionAppend>::get();
-    pTypes[7] = cppu::UnoType<text::XParagraphAppend>::get();
-    pTypes[8] = cppu::UnoType<text::XTextContentAppend>::get();
-    pTypes[9] = cppu::UnoType<text::XTextConvert>::get();
-    pTypes[10] = cppu::UnoType<text::XTextAppend>::get();
-    pTypes[11] = cppu::UnoType<text::XTextAppendAndConvert>::get();
-
-    return aRet;
+    static const uno::Sequence< uno::Type > aTypes {
+        cppu::UnoType<text::XText>::get(),
+        cppu::UnoType<text::XTextRangeCompare>::get(),
+        cppu::UnoType<text::XRelativeTextContentInsert>::get(),
+        cppu::UnoType<text::XRelativeTextContentRemove>::get(),
+        cppu::UnoType<lang::XUnoTunnel>::get(),
+        cppu::UnoType<beans::XPropertySet>::get(),
+        cppu::UnoType<text::XTextPortionAppend>::get(),
+        cppu::UnoType<text::XParagraphAppend>::get(),
+        cppu::UnoType<text::XTextContentAppend>::get(),
+        cppu::UnoType<text::XTextConvert>::get(),
+        cppu::UnoType<text::XTextAppend>::get(),
+        cppu::UnoType<text::XTextAppendAndConvert>::get()
+    };
+    return aTypes;
 }
 
 // belongs the range in the text ? insert it then.
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 6d638bba6c20..aa512beb2a98 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -298,20 +298,15 @@ void SwXDocumentSettings::release ()
 
 uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes(  )
 {
-    SolarMutexGuard aGuard;
-
-    uno::Sequence< uno::Type > aBaseTypes( 5 );
-    uno::Type* pBaseTypes = aBaseTypes.getArray();
-
-    // from MasterPropertySet
-    pBaseTypes[0] = cppu::UnoType<XPropertySet>::get();
-    pBaseTypes[1] = cppu::UnoType<XPropertyState>::get();
-    pBaseTypes[2] = cppu::UnoType<XMultiPropertySet>::get();
-
-    pBaseTypes[3] = cppu::UnoType<XServiceInfo>::get();
-    pBaseTypes[4] = cppu::UnoType<XTypeProvider>::get();
-
-    return aBaseTypes;
+    static const uno::Sequence< uno::Type > aTypes {
+        // from MasterPropertySet
+        cppu::UnoType<XPropertySet>::get(),
+        cppu::UnoType<XPropertyState>::get(),
+        cppu::UnoType<XMultiPropertySet>::get(),
+        cppu::UnoType<XServiceInfo>::get(),
+        cppu::UnoType<XTypeProvider>::get(),
+    };
+    return aTypes;
 }
 
 uno::Sequence< sal_Int8 > SAL_CALL SwXDocumentSettings::getImplementationId(  )
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 8a4c1dd260d6..0a7c3d09b721 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -373,9 +373,6 @@ Reference< XAdapter > SwXTextDocument::queryAdapter(  )
 
 Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes()
 {
-    Sequence< uno::Type > aBaseTypes = SfxBaseModel::getTypes();
-    Sequence< uno::Type > aTextTypes = SwXTextDocumentBaseClass::getTypes();
-
     Sequence< uno::Type > aNumTypes;
     GetNumberFormatter();
     if(xNumFormatAgg.is())
@@ -388,24 +385,13 @@ Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes()
             aNumTypes = xNumProv->getTypes();
         }
     }
-    long nIndex = aBaseTypes.getLength();
-    // don't forget the lang::XMultiServiceFactory and the XTiledRenderable
-    aBaseTypes.realloc(aBaseTypes.getLength() + aTextTypes.getLength() + aNumTypes.getLength() + 2);
-    uno::Type* pBaseTypes = aBaseTypes.getArray();
-    const uno::Type* pTextTypes = aTextTypes.getConstArray();
-    long nPos;
-    for(nPos = 0; nPos < aTextTypes.getLength(); nPos++)
-    {
-        pBaseTypes[nIndex++] = pTextTypes[nPos];
-    }
-    const uno::Type* pNumTypes = aNumTypes.getConstArray();
-    for(nPos = 0; nPos < aNumTypes.getLength(); nPos++)
-    {
-        pBaseTypes[nIndex++] = pNumTypes[nPos];
-    }
-    pBaseTypes[nIndex++] = cppu::UnoType<lang::XMultiServiceFactory>::get();
-    pBaseTypes[nIndex++] = cppu::UnoType<tiledrendering::XTiledRenderable>::get();
-    return aBaseTypes;
+    return comphelper::concatSequences(
+            SfxBaseModel::getTypes(),
+            SwXTextDocumentBaseClass::getTypes(),
+            aNumTypes,
+            Sequence {
+                cppu::UnoType<lang::XMultiServiceFactory>::get(),
+                cppu::UnoType<tiledrendering::XTiledRenderable>::get()});
 }
 
 SwXTextDocument::SwXTextDocument(SwDocShell* pShell)
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index bd27ee2035ec..8a81ae329455 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -133,22 +133,17 @@ void SwXTextView::Invalidate()
 
 Sequence< uno::Type > SAL_CALL SwXTextView::getTypes(  )
 {
-    uno::Sequence< uno::Type > aBaseTypes = SfxBaseController::getTypes();
-
-    long nIndex = aBaseTypes.getLength();
-    aBaseTypes.realloc(
-        aBaseTypes.getLength() + 8 );
-
-    uno::Type* pBaseTypes = aBaseTypes.getArray();
-    pBaseTypes[nIndex++] = cppu::UnoType<XSelectionSupplier>::get();
-    pBaseTypes[nIndex++] = cppu::UnoType<XServiceInfo>::get();
-    pBaseTypes[nIndex++] = cppu::UnoType<XFormLayerAccess>::get();
-    pBaseTypes[nIndex++] = cppu::UnoType<XTextViewCursorSupplier>::get();
-    pBaseTypes[nIndex++] = cppu::UnoType<XViewSettingsSupplier>::get();
-    pBaseTypes[nIndex++] = cppu::UnoType<XRubySelection>::get();
-    pBaseTypes[nIndex++] = cppu::UnoType<XPropertySet>::get();
-    pBaseTypes[nIndex++] = cppu::UnoType<datatransfer::XTransferableSupplier>::get();
-    return aBaseTypes;
+    return cppu::OTypeCollection(
+            cppu::UnoType<XSelectionSupplier>::get(),
+            cppu::UnoType<XServiceInfo>::get(),
+            cppu::UnoType<XFormLayerAccess>::get(),
+            cppu::UnoType<XTextViewCursorSupplier>::get(),
+            cppu::UnoType<XViewSettingsSupplier>::get(),
+            cppu::UnoType<XRubySelection>::get(),
+            cppu::UnoType<XPropertySet>::get(),
+            cppu::UnoType<datatransfer::XTransferableSupplier>::get(),
+            SfxBaseController::getTypes()
+        ).getTypes();
 }
 
 Sequence< sal_Int8 > SAL_CALL SwXTextView::getImplementationId(  )