[Libreoffice-commits] core.git: comphelper/source connectivity/source dbaccess/source extensions/source

Mesut Çifci (via logerrit) logerrit at kemper.freedesktop.org
Thu Jan 16 17:21:14 UTC 2020


 comphelper/source/property/genericpropertyset.cxx        |    3 +--
 comphelper/source/streaming/seqinputstreamserv.cxx       |    3 +--
 comphelper/source/streaming/seqoutputstreamserv.cxx      |    3 +--
 connectivity/source/drivers/hsqldb/HColumns.cxx          |    4 +---
 connectivity/source/drivers/mysql_jdbc/YColumns.cxx      |    4 +---
 connectivity/source/parse/PColumn.cxx                    |    4 +---
 dbaccess/source/core/api/querycomposer.cxx               |    3 +--
 dbaccess/source/core/api/statement.cxx                   |    3 +--
 dbaccess/source/core/dataaccess/bookmarkcontainer.cxx    |    3 +--
 dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx |    6 ++----
 extensions/source/bibliography/framectr.cxx              |    3 +--
 11 files changed, 12 insertions(+), 27 deletions(-)

New commits:
commit 3b9495f82c5eb371b747bc9424c29c49e7a45a67
Author:     Mesut Çifci <mesutcifci97 at gmail.com>
AuthorDate: Thu Jan 16 10:52:24 2020 +0300
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jan 16 18:20:40 2020 +0100

    tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
    
    Change-Id: Ic6ed5dcf6343a4ff59a1f69c77c82b03b4ee6198
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86904
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index 72cec45e2992..298cb53b9c73 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -243,8 +243,7 @@ OUString SAL_CALL GenericPropertySet::getImplementationName()
 
 Sequence< OUString > SAL_CALL GenericPropertySet::getSupportedServiceNames(  )
 {
-    Sequence<OUString> aSNS { "com.sun.star.beans.XPropertySet" };
-    return aSNS;
+    return { "com.sun.star.beans.XPropertySet" };
 }
 
 css::uno::Reference< css::beans::XPropertySet > comphelper::GenericPropertySet_CreateInstance( comphelper::PropertySetInfo* pInfo )
diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx
index bdf6a6e19d34..2f5c21753b03 100644
--- a/comphelper/source/streaming/seqinputstreamserv.cxx
+++ b/comphelper/source/streaming/seqinputstreamserv.cxx
@@ -96,8 +96,7 @@ sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const &
 
 uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames()
 {
-    uno::Sequence<OUString> s { "com.sun.star.io.SequenceInputStream" };
-    return s;
+    return { "com.sun.star.io.SequenceInputStream" };
 }
 
 // css::io::XInputStream:
diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx
index cadc691c8f03..477961397413 100644
--- a/comphelper/source/streaming/seqoutputstreamserv.cxx
+++ b/comphelper/source/streaming/seqoutputstreamserv.cxx
@@ -83,8 +83,7 @@ sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const &
 
 uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames()
 {
-    uno::Sequence<OUString> s { "com.sun.star.io.SequenceOutputStream" };
-    return s;
+    return { "com.sun.star.io.SequenceOutputStream" };
 }
 
 // css::io::XOutputStream:
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index da9b8bbd442b..3f03c3616bc1 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -69,9 +69,7 @@ void OHSQLColumn::construct()
 
 Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames(  )
 {
-    Sequence< OUString > aSupported { "com.sun.star.sdbcx.Column" };
-
-    return aSupported;
+    return { "com.sun.star.sdbcx.Column" };
 }
 
 
diff --git a/connectivity/source/drivers/mysql_jdbc/YColumns.cxx b/connectivity/source/drivers/mysql_jdbc/YColumns.cxx
index cb55be53dbd5..54beb77ca061 100644
--- a/connectivity/source/drivers/mysql_jdbc/YColumns.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YColumns.cxx
@@ -66,9 +66,7 @@ void OMySQLColumn::construct()
 
 Sequence<OUString> SAL_CALL OMySQLColumn::getSupportedServiceNames()
 {
-    Sequence<OUString> aSupported{ "com.sun.star.sdbcx.Column" };
-
-    return aSupported;
+    return { "com.sun.star.sdbcx.Column" };
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 3091613fc867..0074d2be6824 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -264,9 +264,7 @@ void OOrderColumn::construct()
 
 css::uno::Sequence< OUString > SAL_CALL OOrderColumn::getSupportedServiceNames(  )
 {
-    css::uno::Sequence< OUString > aSupported { "com.sun.star.sdb.OrderColumn" };
-
-    return aSupported;
+    return { "com.sun.star.sdb.OrderColumn" };
 }
 
 
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index 817ceb9dcafa..ed402271c051 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -112,8 +112,7 @@ sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName )
 
 Sequence< OUString > OQueryComposer::getSupportedServiceNames(  )
 {
-    Sequence<OUString> aSNS { SERVICE_SDB_SQLQUERYCOMPOSER };
-    return aSNS;
+    return { SERVICE_SDB_SQLQUERYCOMPOSER };
 }
 
 // XSQLQueryComposer
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index 21921604d273..90f939c076f3 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -436,8 +436,7 @@ sal_Bool OStatement::supportsService( const OUString& _rServiceName )
 
 Sequence< OUString > OStatement::getSupportedServiceNames(  )
 {
-    Sequence<OUString> aSNS { SERVICE_SDBC_STATEMENT };
-    return aSNS;
+    return { SERVICE_SDBC_STATEMENT };
 }
 
 // XStatement
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 85896cd3e8f0..a0a88dea9934 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -77,8 +77,7 @@ sal_Bool SAL_CALL OBookmarkContainer::supportsService( const OUString& _rService
 
 Sequence< OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames(  )
 {
-    Sequence< OUString > aReturn { "com.sun.star.sdb.DefinitionContainer" };
-    return aReturn;
+    return { "com.sun.star.sdb.DefinitionContainer" };
 }
 
 // XNameContainer
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index e689c22f7f10..d35d6ac00e55 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -176,8 +176,7 @@ namespace
 
     Sequence< OUString > SAL_CALL DataAccessDescriptor::getSupportedServiceNames(  )
     {
-        Sequence< OUString > aServices { "com.sun.star.sdb.DataAccessDescriptor" };
-        return aServices;
+        return { "com.sun.star.sdb.DataAccessDescriptor" };
     }
 
     Reference< XPropertySetInfo > SAL_CALL DataAccessDescriptor::getPropertySetInfo()
@@ -229,8 +228,7 @@ namespace
 
     Sequence< OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames()
     {
-        Sequence< OUString > aServices { "com.sun.star.sdb.DataAccessDescriptorFactory" };
-        return aServices;
+        return { "com.sun.star.sdb.DataAccessDescriptorFactory" };
     }
 
     Reference< XPropertySet > SAL_CALL DataAccessDescriptorFactory::createDataAccessDescriptor(  )
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index fc963e1f149c..694d2c31a78c 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -181,8 +181,7 @@ css::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedSer
 {
     // return only top level services ...
     // base services are included there and should be asked by uno-rtti.
-    css::uno::Sequence< OUString > lNames { "com.sun.star.frame.Bibliography" };
-    return lNames;
+    return { "com.sun.star.frame.Bibliography" };
 }
 
 void BibFrameController_Impl::attachFrame( const uno::Reference< XFrame > & xArg )


More information about the Libreoffice-commits mailing list