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>

6 files changed, 12 insertions, 18 deletions

diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index f4e864089e91..be989a78e6eb 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -710,9 +710,8 @@ OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName()
 
 Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes()
 {
-    Sequence< css::uno::Type > aSeq( 1 );
-    aSeq[ 0 ] = cppu::UnoType<XAccessibleText>::get();
-    return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
+    return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(),
+        Sequence { cppu::UnoType<XAccessibleText>::get() });
 }
 
 Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId()
@@ -1194,10 +1193,10 @@ OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName()
 
 Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes()
 {
-    Sequence< css::uno::Type > aSeq( 2 );
-    aSeq[ 0 ] = cppu::UnoType<XAccessibleTable>::get();
-    aSeq[ 1 ] = cppu::UnoType<XAccessibleSelection>::get();
-    return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
+    return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(),
+        Sequence {
+            cppu::UnoType<XAccessibleTable>::get(),
+            cppu::UnoType<XAccessibleSelection>::get() });
 }
 
 Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId()
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 4afafe7c91fb..c87a185a9913 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -8483,10 +8483,9 @@ void SAL_CALL ScTableColumnObj::release() throw()
 
 uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes()
 {
-    static const uno::Sequence<uno::Type> aTypes = comphelper::concatSequences(
+    return comphelper::concatSequences(
         ScCellRangeObj::getTypes(),
         uno::Sequence<uno::Type> { cppu::UnoType<container::XNamed>::get() } );
-    return aTypes;
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId()
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index 8886ee8b4f51..b676dba40a46 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -67,7 +67,7 @@ void SAL_CALL ScCellCursorObj::release() throw()
 
 uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes()
 {
-    static const uno::Sequence<uno::Type> aTypes = comphelper::concatSequences(
+    return comphelper::concatSequences(
         ScCellRangeObj::getTypes(),
         uno::Sequence<uno::Type>
         {
@@ -75,7 +75,6 @@ uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes()
             cppu::UnoType<sheet::XUsedAreaCursor>::get(),
             cppu::UnoType<table::XCellCursor>::get()
         } );
-    return aTypes;
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScCellCursorObj::getImplementationId()
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index afb58aa355f3..ab921ea659b5 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1091,14 +1091,13 @@ void SAL_CALL ScDataPilotTableObj::release() throw()
 
 Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes()
 {
-    static const Sequence< uno::Type > aTypes = comphelper::concatSequences(
+    return comphelper::concatSequences(
         ScDataPilotDescriptorBase::getTypes(),
         Sequence< uno::Type >
         {
             cppu::UnoType<XDataPilotTable2>::get(),
             cppu::UnoType<XModifyBroadcaster>::get()
         } );
-    return aTypes;
 }
 
 Sequence<sal_Int8> SAL_CALL ScDataPilotTableObj::getImplementationId()
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 298d73392899..e7377282900d 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -1335,7 +1335,7 @@ uno::Sequence<OUString> SAL_CALL ScEditFieldObj::getSupportedServiceNames()
 
 uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes()
 {
-    static const uno::Sequence<uno::Type> aTypes = comphelper::concatSequences(
+    return comphelper::concatSequences(
         OComponentHelper::getTypes(),
         uno::Sequence<uno::Type>
         {
@@ -1344,7 +1344,6 @@ uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes()
             cppu::UnoType<lang::XUnoTunnel>::get(),
             cppu::UnoType<lang::XServiceInfo>::get()
         } );
-    return aTypes;
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScEditFieldObj::getImplementationId()
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 576a9d6e43a2..ebf219248295 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -157,7 +157,7 @@ uno::Any SAL_CALL ScViewPaneBase::queryInterface( const uno::Type& rType )
 
 uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes()
 {
-    static uno::Sequence<uno::Type> aTypes
+    static const uno::Sequence<uno::Type> aTypes
     {
         cppu::UnoType<sheet::XViewPane>::get(),
         cppu::UnoType<sheet::XCellRangeReferrer>::get(),
@@ -576,7 +576,7 @@ void ScTabViewObj::SheetChanged( bool bSameTabButMoved )
 
 uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes()
 {
-    static const uno::Sequence<uno::Type> aTypes = comphelper::concatSequences(
+    return comphelper::concatSequences(
         ScViewPaneBase::getTypes(),
         SfxBaseController::getTypes(),
         uno::Sequence<uno::Type>
@@ -594,7 +594,6 @@ uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes()
             cppu::UnoType<sheet::XActivationBroadcaster>::get(),
             cppu::UnoType<datatransfer::XTransferableSupplier>::get()
         } );
-    return aTypes;
 }
 
 uno::Sequence<sal_Int8> SAL_CALL ScTabViewObj::getImplementationId()