tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in cppuhelper, desktop, drawinglayer, embeddedobj, extensions Change-Id: I4c970f08c0723299f79c9e18bc71b7372a7092e4 Reviewed-on: https://gerrit.libreoffice.org/77636 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
@@ -907,10 +907,7 @@ sal_Bool cppuhelper::ServiceManager::supportsService(
|
||||
css::uno::Sequence< OUString >
|
||||
cppuhelper::ServiceManager::getSupportedServiceNames()
|
||||
{
|
||||
css::uno::Sequence< OUString > names(2);
|
||||
names[0] = "com.sun.star.lang.MultiServiceFactory";
|
||||
names[1] = "com.sun.star.lang.ServiceManager";
|
||||
return names;
|
||||
return { "com.sun.star.lang.MultiServiceFactory", "com.sun.star.lang.ServiceManager" };
|
||||
}
|
||||
|
||||
css::uno::Reference< css::uno::XInterface >
|
||||
|
||||
@@ -328,8 +328,7 @@ sal_Bool RequestHandlerController::supportsService(
|
||||
|
||||
Sequence< OUString > SAL_CALL RequestHandlerController::getSupportedServiceNames()
|
||||
{
|
||||
Sequence< OUString > aSeq( 0 );
|
||||
return aSeq;
|
||||
return { };
|
||||
}
|
||||
|
||||
// XEventListener
|
||||
|
||||
@@ -74,13 +74,11 @@ sal_Bool SAL_CALL LOKInteractionHandler::supportsService(OUString const & rServi
|
||||
|
||||
uno::Sequence< OUString > SAL_CALL LOKInteractionHandler::getSupportedServiceNames()
|
||||
{
|
||||
uno::Sequence< OUString > aNames(3);
|
||||
aNames[0] = "com.sun.star.task.InteractionHandler";
|
||||
// added to indicate support for configuration.backend.MergeRecoveryRequest
|
||||
aNames[1] = "com.sun.star.configuration.backend.InteractionHandler";
|
||||
aNames[2] = "com.sun.star.uui.InteractionHandler";
|
||||
// for backwards compatibility
|
||||
return aNames;
|
||||
return { "com.sun.star.task.InteractionHandler",
|
||||
// added to indicate support for configuration.backend.MergeRecoveryRequest
|
||||
"com.sun.star.configuration.backend.InteractionHandler",
|
||||
// for backwards compatibility
|
||||
"com.sun.star.uui.InteractionHandler" };
|
||||
}
|
||||
|
||||
void SAL_CALL LOKInteractionHandler::initialize(uno::Sequence<uno::Any> const & /*rArguments*/)
|
||||
|
||||
@@ -107,8 +107,7 @@ rtl::OUString Provider::static_getImplementationName() {
|
||||
|
||||
css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
|
||||
{
|
||||
rtl::OUString name("com.sun.star.test.deployment.active_native");
|
||||
return css::uno::Sequence< rtl::OUString >(&name, 1);
|
||||
return { "com.sun.star.test.deployment.active_native" };
|
||||
}
|
||||
|
||||
css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
|
||||
|
||||
@@ -104,8 +104,7 @@ rtl::OUString Provider::static_getImplementationName() {
|
||||
|
||||
css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
|
||||
{
|
||||
rtl::OUString name("com.sun.star.test.deployment.passive_native");
|
||||
return css::uno::Sequence< rtl::OUString >(&name, 1);
|
||||
return { "com.sun.star.test.deployment.passive_native" };
|
||||
}
|
||||
|
||||
css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
|
||||
|
||||
@@ -82,7 +82,7 @@ namespace drawinglayer
|
||||
{
|
||||
uno::Sequence< OUString > XPrimitive2DRenderer_getSupportedServiceNames()
|
||||
{
|
||||
return uno::Sequence< OUString > { "com.sun.star.graphic.Primitive2DTools" };
|
||||
return { "com.sun.star.graphic.Primitive2DTools" };
|
||||
}
|
||||
|
||||
OUString XPrimitive2DRenderer_getImplementationName()
|
||||
|
||||
@@ -384,10 +384,7 @@ uno::Sequence< OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupportedService
|
||||
|
||||
uno::Sequence< OUString > OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames()
|
||||
{
|
||||
uno::Sequence< OUString > aRet(2);
|
||||
aRet[0] = "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory";
|
||||
aRet[1] = "com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory";
|
||||
return aRet;
|
||||
return { "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory", "com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory" };
|
||||
}
|
||||
|
||||
OUString OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName()
|
||||
|
||||
@@ -182,12 +182,7 @@ Sequence< OUString > BibliographyLoader::getSupportedServiceNames()
|
||||
// ORegistryServiceManager_Static
|
||||
Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static() throw( )
|
||||
{
|
||||
Sequence< OUString > aSNS( 2 );
|
||||
aSNS.getArray()[0] = "com.sun.star.frame.FrameLoader";
|
||||
//!
|
||||
aSNS.getArray()[1] = "com.sun.star.frame.Bibliography";
|
||||
//!
|
||||
return aSNS;
|
||||
return { "com.sun.star.frame.FrameLoader", "com.sun.star.frame.Bibliography" };
|
||||
}
|
||||
|
||||
extern "C"
|
||||
|
||||
Reference in New Issue
Block a user