summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2019-08-17 20:32:59 +0200
committerJulien Nabet <serval2412@yahoo.fr>2019-08-17 22:16:31 +0200
commitcc70a9dec7730661aacd5fe7ed62f0a29ebf1084 (patch)
tree840ae6e913a7e810951b2348c8bfd3909b881c8e /stoc
parent7990680e92e4fba376ef4f9346d1bc53661bde30 (diff)
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in sfx2, stoc Change-Id: I7138f702317d0e693438216732bf181f1972cdc1 Reviewed-on: https://gerrit.libreoffice.org/77648 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/javaloader/javaloader.cxx5
-rw-r--r--stoc/source/proxy_factory/proxyfac.cxx3
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx10
-rw-r--r--stoc/test/testsmgr_cpnt.cxx5
4 files changed, 5 insertions, 18 deletions
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 4832b4c346d6..06332c73329f 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -68,10 +68,7 @@ static Mutex & getInitMutex();
static Sequence< OUString > loader_getSupportedServiceNames()
{
- Sequence< OUString > seqNames(2);
- seqNames.getArray()[0] = "com.sun.star.loader.Java";
- seqNames.getArray()[1] = "com.sun.star.loader.Java2";
- return seqNames;
+ return { "com.sun.star.loader.Java", "com.sun.star.loader.Java2" };
}
static OUString loader_getImplementationName()
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index 55d53661dccd..38da29b3485a 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -56,8 +56,7 @@ OUString proxyfac_getImplementationName()
Sequence< OUString > proxyfac_getSupportedServiceNames()
{
- OUString str_name = SERVICE_NAME;
- return Sequence< OUString >( &str_name, 1 );
+ return { SERVICE_NAME };
}
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 880b478ec847..264285d75174 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -906,10 +906,7 @@ sal_Bool OServiceManager::supportsService(const OUString& ServiceName)
// XServiceInfo
Sequence< OUString > OServiceManager::getSupportedServiceNames()
{
- Sequence< OUString > seqNames(2);
- seqNames[0] = "com.sun.star.lang.MultiServiceFactory";
- seqNames[1] = "com.sun.star.lang.ServiceManager";
- return seqNames;
+ return { "com.sun.star.lang.MultiServiceFactory", "com.sun.star.lang.ServiceManager" };
}
@@ -1377,10 +1374,7 @@ Sequence< OUString > ORegistryServiceManager::getAvailableServiceNames()
// XServiceInfo
Sequence< OUString > ORegistryServiceManager::getSupportedServiceNames()
{
- Sequence< OUString > seqNames(2);
- seqNames[0] = "com.sun.star.lang.MultiServiceFactory";
- seqNames[1] = "com.sun.star.lang.RegistryServiceManager";
- return seqNames;
+ return { "com.sun.star.lang.MultiServiceFactory", "com.sun.star.lang.RegistryServiceManager" };
}
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index b09bb7ea3a45..7faf7fea9686 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -148,10 +148,7 @@ Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames() throw ()
Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static() throw ()
{
- Sequence< OUString > aSNS( 2 );
- aSNS.getArray()[0] = SERVICE_NAME;
- aSNS.getArray()[1] = "com.sun.star.bridge.Bridge";
- return aSNS;
+ return { SERVICE_NAME, "com.sun.star.bridge.Bridge" };
}