From 3d24130986e6a0e1baa2cff61309f0f42cf0c339 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 17 Aug 2019 11:39:47 +0200 Subject: Use simplified syntax for Sequence Change-Id: I92ac60fafcc404439c101d1950ed214fce140c91 Reviewed-on: https://gerrit.libreoffice.org/77621 Tested-by: Jenkins Reviewed-by: Julien Nabet --- dbaccess/source/core/api/RowSet.cxx | 6 +++--- dbaccess/source/core/api/callablestatement.cxx | 2 +- dbaccess/source/core/api/datacolumn.cxx | 3 +-- dbaccess/source/core/api/definitioncolumn.cxx | 6 +++--- dbaccess/source/core/api/preparedstatement.cxx | 2 +- dbaccess/source/core/api/querydescriptor.cxx | 2 +- dbaccess/source/core/api/resultcolumn.cxx | 2 +- dbaccess/source/core/api/resultset.cxx | 2 +- dbaccess/source/core/dataaccess/definitioncontainer.cxx | 2 +- dbaccess/source/core/dataaccess/documentcontainer.cxx | 2 +- dbaccess/source/core/misc/DatabaseDataProvider.cxx | 2 +- dbaccess/source/ui/browser/dbloader.cxx | 2 +- dbaccess/source/ui/browser/sbagrid.cxx | 2 +- 13 files changed, 17 insertions(+), 18 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 1485d77dcdec..48597c9b2c00 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -478,8 +478,8 @@ sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) Sequence< OUString > SAL_CALL ORowSet::getSupportedServiceNames() { - return Sequence< OUString >{ SERVICE_SDBC_RESULTSET, SERVICE_SDBC_ROWSET, - SERVICE_SDBCX_RESULTSET, SERVICE_SDB_RESULTSET, SERVICE_SDB_ROWSET }; + return { SERVICE_SDBC_RESULTSET, SERVICE_SDBC_ROWSET, SERVICE_SDBCX_RESULTSET, + SERVICE_SDB_RESULTSET, SERVICE_SDB_ROWSET }; } // OComponentHelper @@ -2870,7 +2870,7 @@ sal_Bool ORowSetClone::supportsService( const OUString& _rServiceName ) Sequence< OUString > ORowSetClone::getSupportedServiceNames( ) { - return Sequence< OUString > { SERVICE_SDBC_RESULTSET, SERVICE_SDB_RESULTSET }; + return { SERVICE_SDBC_RESULTSET, SERVICE_SDB_RESULTSET }; } // OComponentHelper diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index db0db3695e0d..f8a51d465cfb 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -78,7 +78,7 @@ OUString OCallableStatement::getImplementationName( ) Sequence< OUString > OCallableStatement::getSupportedServiceNames( ) { - return Sequence< OUString > { SERVICE_SDBC_CALLABLESTATEMENT, SERVICE_SDB_CALLABLESTATEMENT }; + return { SERVICE_SDBC_CALLABLESTATEMENT, SERVICE_SDB_CALLABLESTATEMENT }; } // XOutParameters diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index 3ce0dbb9ccaf..8153c5de70f2 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -89,8 +89,7 @@ OUString ODataColumn::getImplementationName( ) Sequence< OUString > ODataColumn::getSupportedServiceNames( ) { - return Sequence< OUString > { SERVICE_SDBCX_COLUMN, SERVICE_SDB_RESULTCOLUMN, - SERVICE_SDB_DATACOLUMN }; + return { SERVICE_SDBCX_COLUMN, SERVICE_SDB_RESULTCOLUMN, SERVICE_SDB_DATACOLUMN }; } // OComponentHelper diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index 2cd33cfbd2fc..17bdfaaf0d09 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -92,7 +92,7 @@ OUString OTableColumnDescriptor::getImplementationName( ) Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames( ) { - return Sequence< OUString > { m_bActAsDescriptor? OUString(SERVICE_SDBCX_COLUMNDESCRIPTOR) : OUString(SERVICE_SDBCX_COLUMN), + return { m_bActAsDescriptor? OUString(SERVICE_SDBCX_COLUMNDESCRIPTOR) : OUString(SERVICE_SDBCX_COLUMN), SERVICE_SDB_COLUMNSETTINGS }; } @@ -436,7 +436,7 @@ OUString OTableColumnDescriptorWrapper::getImplementationName( ) Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) { - return Sequence< OUString > { SERVICE_SDBCX_COLUMNDESCRIPTOR, SERVICE_SDB_COLUMNSETTINGS }; + return { SERVICE_SDBCX_COLUMNDESCRIPTOR, SERVICE_SDB_COLUMNSETTINGS }; } // comphelper::OPropertyArrayUsageHelper @@ -594,7 +594,7 @@ OUString OTableColumnWrapper::getImplementationName( ) Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames( ) { - return Sequence< OUString > { SERVICE_SDBCX_COLUMN, SERVICE_SDB_COLUMNSETTINGS }; + return { SERVICE_SDBCX_COLUMN, SERVICE_SDB_COLUMNSETTINGS }; } ::cppu::IPropertyArrayHelper& OTableColumnWrapper::getInfoHelper() diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 012792c512c2..fcdcf7e7a230 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -119,7 +119,7 @@ sal_Bool OPreparedStatement::supportsService( const OUString& _rServiceName ) Sequence< OUString > OPreparedStatement::getSupportedServiceNames( ) { - return Sequence< OUString > { SERVICE_SDBC_PREPAREDSTATEMENT, SERVICE_SDB_PREPAREDSTATMENT }; + return { SERVICE_SDBC_PREPAREDSTATEMENT, SERVICE_SDB_PREPAREDSTATMENT }; } // OComponentHelper diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 3e2f017d37ad..ea31bbc7275e 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -223,7 +223,7 @@ sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const OUString& _rServ Sequence< OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames( ) { - return Sequence< OUString > { SERVICE_SDB_DATASETTINGS, SERVICE_SDB_QUERYDESCRIPTOR }; + return { SERVICE_SDB_DATASETTINGS, SERVICE_SDB_QUERYDESCRIPTOR }; } void OQueryDescriptor_Base::disposeColumns() diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 3c91cce4a303..ea2e1d26f859 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -116,7 +116,7 @@ OUString OResultColumn::getImplementationName( ) Sequence< OUString > OResultColumn::getSupportedServiceNames( ) { - return Sequence< OUString > { SERVICE_SDBCX_COLUMN, SERVICE_SDB_RESULTCOLUMN }; + return { SERVICE_SDBCX_COLUMN, SERVICE_SDB_RESULTCOLUMN }; } // OComponentHelper diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 5a7514fecd49..f43fedd1a32f 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -179,7 +179,7 @@ sal_Bool OResultSet::supportsService( const OUString& _rServiceName ) Sequence< OUString > OResultSet::getSupportedServiceNames( ) { - return Sequence< OUString > { SERVICE_SDBC_RESULTSET, SERVICE_SDB_RESULTSET }; + return { SERVICE_SDBC_RESULTSET, SERVICE_SDB_RESULTSET }; } // css::beans::XPropertySet diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 950ce083db62..738aba7b86f7 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -152,7 +152,7 @@ OUString SAL_CALL ODefinitionContainer::getImplementationName( ) Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames( ) { - return Sequence< OUString > { "com.sun.star.sdb.DefinitionContainer", "com.sun.star.ucb.Content" }; + return { "com.sun.star.sdb.DefinitionContainer", "com.sun.star.ucb.Content" }; } // XNameContainer diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index c179d1234b13..cad8369ba479 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -119,7 +119,7 @@ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(ODocumentContainer) Sequence< OUString > SAL_CALL ODocumentContainer::getSupportedServiceNames( ) { - return Sequence< OUString > { m_bFormsContainer ? OUString(SERVICE_NAME_FORM_COLLECTION) : OUString(SERVICE_NAME_REPORT_COLLECTION) }; + return { m_bFormsContainer ? OUString(SERVICE_NAME_FORM_COLLECTION) : OUString(SERVICE_NAME_REPORT_COLLECTION) }; } OUString ODocumentContainer::determineContentType() const diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index 7c4927765c5e..a99e2aa559e1 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -123,7 +123,7 @@ sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const OUString& _rServi uno::Sequence< OUString > DatabaseDataProvider::getSupportedServiceNames_Static( ) { - return uno::Sequence { "com.sun.star.chart2.data.DatabaseDataProvider" }; + return { "com.sun.star.chart2.data.DatabaseDataProvider" }; } uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames( ) diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index d4903a4de4fa..35df7976f0d6 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -130,7 +130,7 @@ Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames() // ORegistryServiceManager_Static Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static() throw( ) { - return Sequence< OUString > { "com.sun.star.frame.FrameLoader", "com.sun.star.sdb.ContentLoader" }; + return { "com.sun.star.frame.FrameLoader", "com.sun.star.sdb.ContentLoader" }; } void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OUString& rURL, diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index eba9dd077461..9e8508231ea1 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -137,7 +137,7 @@ OUString SbaXGridControl::getImplementationName_Static() Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static() { - return Sequence< OUString> { "com.sun.star.form.control.InteractionGridControl", "com.sun.star.form.control.GridControl", + return { "com.sun.star.form.control.InteractionGridControl", "com.sun.star.form.control.GridControl", "com.sun.star.awt.UnoControl" }; } -- cgit