diff options
21 files changed, 21 insertions, 97 deletions
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 69381285eb7d..d97d018bc202 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -85,10 +85,7 @@ OUString ODriver::getImplementationName_Static( ) Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) { - Sequence< OUString > aSNS( 2 ); - aSNS[0] = "com.sun.star.sdbc.Driver"; - aSNS[1] = "com.sun.star.sdbcx.Driver"; - return aSNS; + return { "com.sun.star.sdbc.Driver", "com.sun.star.sdbcx.Driver" }; } css::uno::Reference< css::uno::XInterface > connectivity::ado::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) diff --git a/connectivity/source/drivers/component/CResultSet.cxx b/connectivity/source/drivers/component/CResultSet.cxx index 79d97a62d29f..6c3e463d2012 100644 --- a/connectivity/source/drivers/component/CResultSet.cxx +++ b/connectivity/source/drivers/component/CResultSet.cxx @@ -51,10 +51,7 @@ OUString SAL_CALL OComponentResultSet::getImplementationName( ) Sequence< OUString > SAL_CALL OComponentResultSet::getSupportedServiceNames( ) { - Sequence< OUString > aSupported(2); - aSupported[0] = "com.sun.star.sdbc.ResultSet"; - aSupported[1] = "com.sun.star.sdbcx.ResultSet"; - return aSupported; + return { "com.sun.star.sdbc.ResultSet", "com.sun.star.sdbcx.ResultSet" }; } sal_Bool SAL_CALL OComponentResultSet::supportsService( const OUString& _rServiceName ) diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index 737a87bf559d..572eaa27d69c 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -54,10 +54,7 @@ OUString SAL_CALL ODbaseResultSet::getImplementationName( ) Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) { - Sequence< OUString > aSupported(2); - aSupported[0] = "com.sun.star.sdbc.ResultSet"; - aSupported[1] = "com.sun.star.sdbcx.ResultSet"; - return aSupported; + return { "com.sun.star.sdbc.ResultSet", "com.sun.star.sdbcx.ResultSet" }; } sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 584a0a08b95f..25ccc578f959 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -67,10 +67,7 @@ OUString OFileDriver::getImplementationName_Static( ) Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) { - Sequence< OUString > aSNS( 2 ); - aSNS[0] = "com.sun.star.sdbc.Driver"; - aSNS[1] = "com.sun.star.sdbcx.Driver"; - return aSNS; + return { "com.sun.star.sdbc.Driver", "com.sun.star.sdbcx.Driver" }; } diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 6827d84868b5..d5b480e5ff41 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -143,10 +143,7 @@ OUString FirebirdDriver::getImplementationName_Static() Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() { - Sequence< OUString > aSNS( 2 ); - aSNS[0] = "com.sun.star.sdbc.Driver"; - aSNS[1] = "com.sun.star.sdbcx.Driver"; - return aSNS; + return { "com.sun.star.sdbc.Driver", "com.sun.star.sdbcx.Driver" }; } OUString SAL_CALL FirebirdDriver::getImplementationName() diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index 9399be63e8f8..6247e2759b51 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -52,10 +52,7 @@ OUString SAL_CALL OFlatResultSet::getImplementationName( ) Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) { - Sequence< OUString > aSupported(2); - aSupported[0] = "com.sun.star.sdbc.ResultSet"; - aSupported[1] = "com.sun.star.sdbcx.ResultSet"; - return aSupported; + return { "com.sun.star.sdbc.ResultSet", "com.sun.star.sdbcx.ResultSet" }; } sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName ) diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 17fb9de34676..e76ef27cc59d 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -490,10 +490,7 @@ namespace connectivity Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) { - Sequence< OUString > aSNS( 2 ); - aSNS[0] = "com.sun.star.sdbc.Driver"; - aSNS[1] = "com.sun.star.sdbcx.Driver"; - return aSNS; + return { "com.sun.star.sdbc.Driver", "com.sun.star.sdbcx.Driver" }; } OUString SAL_CALL ODriverDelegator::getImplementationName( ) diff --git a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx index 356233ed3110..d36f78fb3819 100644 --- a/connectivity/source/drivers/mysql_jdbc/YDriver.cxx +++ b/connectivity/source/drivers/mysql_jdbc/YDriver.cxx @@ -406,10 +406,7 @@ OUString ODriverDelegator::getImplementationName_Static() Sequence<OUString> ODriverDelegator::getSupportedServiceNames_Static() { - Sequence<OUString> aSNS(2); - aSNS[0] = "com.sun.star.sdbc.Driver"; - aSNS[1] = "com.sun.star.sdbcx.Driver"; - return aSNS; + return { "com.sun.star.sdbc.Driver", "com.sun.star.sdbcx.Driver" }; } OUString SAL_CALL ODriverDelegator::getImplementationName() diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx index 10dd779cc8f6..193cc1c6ffe2 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx @@ -207,9 +207,7 @@ OUString OConnection::getImplementationName() css::uno::Sequence<OUString> OConnection::getSupportedServiceNames() { - css::uno::Sequence<OUString> s(1); - s[0] = "com.sun.star.sdbc.Connection"; - return s; + return { "com.sun.star.sdbc.Connection" }; } sal_Bool OConnection::supportsService(OUString const& ServiceName) diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx index ba06dcf6a860..44a4367a793d 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx @@ -61,9 +61,7 @@ OUString MysqlCDriver::getImplementationName_Static() Sequence<OUString> MysqlCDriver::getSupportedServiceNames_Static() { - Sequence<OUString> aSNS(1); - aSNS[0] = "com.sun.star.sdbc.Driver"; - return aSNS; + return { "com.sun.star.sdbc.Driver" }; } OUString SAL_CALL MysqlCDriver::getImplementationName() { return getImplementationName_Static(); } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx index d20d2e760ed2..f541daad4ce3 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx @@ -163,10 +163,7 @@ OUString SAL_CALL OPreparedResultSet::getImplementationName() uno::Sequence<OUString> SAL_CALL OPreparedResultSet::getSupportedServiceNames() { - uno::Sequence<OUString> aSupported(2); - aSupported[0] = "com.sun.star.sdbc.ResultSet"; - aSupported[1] = "com.sun.star.sdbcx.ResultSet"; - return aSupported; + return { "com.sun.star.sdbc.ResultSet", "com.sun.star.sdbcx.ResultSet" }; } sal_Bool SAL_CALL OPreparedResultSet::supportsService(const OUString& _rServiceName) diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx index 7622de7bf8d1..08da8640178d 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx @@ -48,9 +48,7 @@ OUString OPreparedStatement::getImplementationName() css::uno::Sequence<OUString> OPreparedStatement::getSupportedServiceNames() { - css::uno::Sequence<OUString> s(1); - s[0] = "com.sun.star.sdbc.PreparedStatement"; - return s; + return { "com.sun.star.sdbc.PreparedStatement" }; } sal_Bool OPreparedStatement::supportsService(OUString const& ServiceName) diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx index 5b6a3d34ffb5..8e2dc3f1144e 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx @@ -103,10 +103,7 @@ OUString SAL_CALL OResultSet::getImplementationName() uno::Sequence<OUString> SAL_CALL OResultSet::getSupportedServiceNames() { - uno::Sequence<OUString> aSupported(2); - aSupported[0] = "com.sun.star.sdbc.ResultSet"; - aSupported[1] = "com.sun.star.sdbcx.ResultSet"; - return aSupported; + return { "com.sun.star.sdbc.ResultSet", "com.sun.star.sdbcx.ResultSet" }; } sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName) diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx index f0f36fe35f79..d562322d894d 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx @@ -330,9 +330,7 @@ OUString OStatement::getImplementationName() { return "com.sun.star.sdbcx.OState css::uno::Sequence<OUString> OStatement::getSupportedServiceNames() { - css::uno::Sequence<OUString> s(1); - s[0] = "com.sun.star.sdbc.Statement"; - return s; + return { "com.sun.star.sdbc.Statement" }; } sal_Bool OStatement::supportsService(OUString const& ServiceName) diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 80fd002adc05..cd323f7b4a46 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -70,10 +70,7 @@ OUString SAL_CALL OResultSet::getImplementationName( ) Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) { - Sequence< OUString > aSupported(2); - aSupported[0] = "com.sun.star.sdbc.ResultSet"; - aSupported[1] = "com.sun.star.sdbcx.ResultSet"; - return aSupported; + return { "com.sun.star.sdbc.ResultSet", "com.sun.star.sdbcx.ResultSet" }; } sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx index 41a515266890..ad26e76a6754 100644 --- a/connectivity/source/sdbcx/VColumn.cxx +++ b/connectivity/source/sdbcx/VColumn.cxx @@ -43,13 +43,7 @@ OUString SAL_CALL OColumn::getImplementationName( ) css::uno::Sequence< OUString > SAL_CALL OColumn::getSupportedServiceNames( ) { - css::uno::Sequence< OUString > aSupported(1); - if(isNew()) - aSupported[0] = "com.sun.star.sdbcx.ColumnDescriptor"; - else - aSupported[0] = "com.sun.star.sdbcx.Column"; - - return aSupported; + return { isNew()?OUString("com.sun.star.sdbcx.ColumnDescriptor"):OUString("com.sun.star.sdbcx.Column") }; } sal_Bool SAL_CALL OColumn::supportsService( const OUString& _rServiceName ) diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index e510195524ea..4939bb702085 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.cxx @@ -48,13 +48,7 @@ OUString SAL_CALL OIndex::getImplementationName( ) css::uno::Sequence< OUString > SAL_CALL OIndex::getSupportedServiceNames( ) { - css::uno::Sequence< OUString > aSupported(1); - if(isNew()) - aSupported[0] = "com.sun.star.sdbcx.IndexDescriptor"; - else - aSupported[0] = "com.sun.star.sdbcx.Index"; - - return aSupported; + return { isNew()?OUString("com.sun.star.sdbcx.IndexDescriptor"):OUString("com.sun.star.sdbcx.Index") }; } sal_Bool SAL_CALL OIndex::supportsService( const OUString& _rServiceName ) diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx index 6bda93ac2a01..41436ee02733 100644 --- a/connectivity/source/sdbcx/VIndexColumn.cxx +++ b/connectivity/source/sdbcx/VIndexColumn.cxx @@ -36,12 +36,7 @@ OUString SAL_CALL OIndexColumn::getImplementationName( ) css::uno::Sequence< OUString > SAL_CALL OIndexColumn::getSupportedServiceNames( ) { - css::uno::Sequence< OUString > aSupported(1); - if(isNew()) - aSupported[0] = "com.sun.star.sdbcx.IndexColumnDescriptor"; - else - aSupported[0] = "com.sun.star.sdbcx.IndexColumn"; - return aSupported; + return { isNew()?OUString("com.sun.star.sdbcx.IndexColumnDescriptor"):OUString("com.sun.star.sdbcx.IndexColumn") }; } sal_Bool SAL_CALL OIndexColumn::supportsService( const OUString& _rServiceName ) diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index f8ef22d52728..25d0526875e4 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.cxx @@ -46,13 +46,7 @@ OUString SAL_CALL OKey::getImplementationName( ) css::uno::Sequence< OUString > SAL_CALL OKey::getSupportedServiceNames( ) { - css::uno::Sequence< OUString > aSupported(1); - if(isNew()) - aSupported[0] = "com.sun.star.sdbcx.KeyDescriptor"; - else - aSupported[0] = "com.sun.star.sdbcx.Key"; - - return aSupported; + return { isNew()?OUString("com.sun.star.sdbcx.KeyDescriptor"):OUString("com.sun.star.sdbcx.Key") }; } sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName ) diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx index 902b907ee7f1..49a779a01350 100644 --- a/connectivity/source/sdbcx/VKeyColumn.cxx +++ b/connectivity/source/sdbcx/VKeyColumn.cxx @@ -37,13 +37,7 @@ OUString SAL_CALL OKeyColumn::getImplementationName( ) css::uno::Sequence< OUString > SAL_CALL OKeyColumn::getSupportedServiceNames( ) { - css::uno::Sequence< OUString > aSupported(1); - if(isNew()) - aSupported[0] = "com.sun.star.sdbcx.KeyColumnDescriptor"; - else - aSupported[0] = "com.sun.star.sdbcx.KeyColumn"; - - return aSupported; + return { isNew()?OUString("com.sun.star.sdbcx.KeyColumnDescriptor"):OUString("com.sun.star.sdbcx.KeyColumn") }; } sal_Bool SAL_CALL OKeyColumn::supportsService( const OUString& _rServiceName ) diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index 2526f6f088c9..70e9c75d4ee5 100644 --- a/connectivity/source/sdbcx/VTable.cxx +++ b/connectivity/source/sdbcx/VTable.cxx @@ -51,13 +51,7 @@ OUString SAL_CALL OTable::getImplementationName( ) css::uno::Sequence< OUString > SAL_CALL OTable::getSupportedServiceNames( ) { - css::uno::Sequence< OUString > aSupported(1); - if(isNew()) - aSupported[0] = "com.sun.star.sdbcx.TableDescriptor"; - else - aSupported[0] = "com.sun.star.sdbcx.Table"; - - return aSupported; + return { isNew()?OUString("com.sun.star.sdbcx.TableDescriptor"):OUString("com.sun.star.sdbcx.Table") }; } sal_Bool SAL_CALL OTable::supportsService( const OUString& _rServiceName ) |