tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in svx Change-Id: I70cba5dbfed9b2bbfe82d89c9dc6a5875c953bd3 Reviewed-on: https://gerrit.libreoffice.org/77649 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
parent
c5be21da50
commit
4073994154
10 changed files with 21 additions and 60 deletions
|
@ -501,13 +501,9 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString
|
|||
|
||||
Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames()
|
||||
{
|
||||
Sequence< OUString > aSNs( 3 );
|
||||
|
||||
aSNs[0] = "com.sun.star.accessibility.Accessible";
|
||||
aSNs[1] = "com.sun.star.accessibility.AccessibleContext";
|
||||
aSNs[2] = "com.sun.star.drawing.AccessibleGraphControl";
|
||||
|
||||
return aSNs;
|
||||
return { "com.sun.star.accessibility.Accessible",
|
||||
"com.sun.star.accessibility.AccessibleContext",
|
||||
"com.sun.star.drawing.AccessibleGraphControl" };
|
||||
}
|
||||
|
||||
// XTypeProvider
|
||||
|
|
|
@ -381,10 +381,7 @@ OUString SAL_CALL FmXGridControl::getImplementationName()
|
|||
|
||||
css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames()
|
||||
{
|
||||
Sequence< OUString > aServiceNames(2);
|
||||
aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
|
||||
aServiceNames[1] = "com.sun.star.awt.UnoControl";
|
||||
return aServiceNames;
|
||||
return { FM_SUN_CONTROL_GRIDCONTROL, "com.sun.star.awt.UnoControl" };
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -185,10 +185,7 @@ namespace svxform
|
|||
|
||||
Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( )
|
||||
{
|
||||
Sequence< OUString > aServices(2);
|
||||
aServices.getArray()[0] = "com.sun.star.form.FormController";
|
||||
aServices.getArray()[1] = "com.sun.star.awt.control.TabController";
|
||||
return aServices;
|
||||
return { "com.sun.star.form.FormController", "com.sun.star.awt.control.TabController" };
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -214,9 +214,7 @@ sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName
|
|||
|
||||
Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames()
|
||||
{
|
||||
OUString aServiceName("com.sun.star.style.Style");
|
||||
Sequence< OUString > aSeq( &aServiceName, 1 );
|
||||
return aSeq;
|
||||
return { "com.sun.star.style.Style" };
|
||||
}
|
||||
|
||||
// XStyle
|
||||
|
@ -464,9 +462,7 @@ sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceNam
|
|||
|
||||
Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames()
|
||||
{
|
||||
OUString aServiceName("com.sun.star.style.StyleFamily");
|
||||
Sequence< OUString > aSeq( &aServiceName, 1 );
|
||||
return aSeq;
|
||||
return { "com.sun.star.style.StyleFamily" };
|
||||
}
|
||||
|
||||
// XNamed
|
||||
|
|
|
@ -1372,10 +1372,7 @@ sal_Bool SAL_CALL FindbarDispatcher::supportsService( const OUString& ServiceNam
|
|||
|
||||
css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNames()
|
||||
{
|
||||
css::uno::Sequence< OUString > aSNS( 2 );
|
||||
aSNS[0] = "com.sun.star.comp.svx.FindbarDispatcher";
|
||||
aSNS[1] = "com.sun.star.frame.ProtocolHandler";
|
||||
return aSNS;
|
||||
return { "com.sun.star.comp.svx.FindbarDispatcher", "com.sun.star.frame.ProtocolHandler" };
|
||||
}
|
||||
|
||||
// XInitialization
|
||||
|
|
|
@ -77,8 +77,7 @@ uno::Sequence< OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedSer
|
|||
|
||||
uno::Sequence< OUString > ChineseTranslation_UnoDialog::getSupportedServiceNames_Static()
|
||||
{
|
||||
uno::Sequence<OUString> aSNS { "com.sun.star.linguistic2.ChineseTranslationDialog" };
|
||||
return aSNS;
|
||||
return { "com.sun.star.linguistic2.ChineseTranslationDialog" };
|
||||
}
|
||||
|
||||
// ui::dialogs::XExecutableDialog
|
||||
|
|
|
@ -282,9 +282,7 @@ OUString SAL_CALL SvxUnoXColorTable::getImplementationName( )
|
|||
|
||||
uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( )
|
||||
{
|
||||
const OUString aServiceName( "com.sun.star.drawing.ColorTable" );
|
||||
uno::Sequence< OUString > aServices( &aServiceName, 1 );
|
||||
return aServices;
|
||||
return { "com.sun.star.drawing.ColorTable" };
|
||||
}
|
||||
|
||||
|
||||
|
@ -349,9 +347,7 @@ OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( )
|
|||
|
||||
uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( )
|
||||
{
|
||||
const OUString aServiceName( "com.sun.star.drawing.LineEndTable" );
|
||||
uno::Sequence< OUString > aServices( &aServiceName, 1 );
|
||||
return aServices;
|
||||
return { "com.sun.star.drawing.LineEndTable" };
|
||||
}
|
||||
|
||||
|
||||
|
@ -426,9 +422,7 @@ OUString SAL_CALL SvxUnoXDashTable::getImplementationName( )
|
|||
|
||||
uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( )
|
||||
{
|
||||
const OUString aServiceName( "com.sun.star.drawing.DashTable" );
|
||||
uno::Sequence< OUString > aServices( &aServiceName, 1 );
|
||||
return aServices;
|
||||
return { "com.sun.star.drawing.DashTable" };
|
||||
}
|
||||
|
||||
|
||||
|
@ -498,9 +492,7 @@ OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( )
|
|||
|
||||
uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( )
|
||||
{
|
||||
const OUString aServiceName( "com.sun.star.drawing.HatchTable" );
|
||||
uno::Sequence< OUString > aServices( &aServiceName, 1 );
|
||||
return aServices;
|
||||
return { "com.sun.star.drawing.HatchTable" };
|
||||
}
|
||||
|
||||
|
||||
|
@ -582,9 +574,7 @@ OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( )
|
|||
|
||||
uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( )
|
||||
{
|
||||
const OUString aServiceName( "com.sun.star.drawing.GradientTable" );
|
||||
uno::Sequence< OUString > aServices( &aServiceName, 1 );
|
||||
return aServices;
|
||||
return { "com.sun.star.drawing.GradientTable" };
|
||||
}
|
||||
|
||||
|
||||
|
@ -653,9 +643,7 @@ OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( )
|
|||
|
||||
uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( )
|
||||
{
|
||||
const OUString aServiceName( "com.sun.star.drawing.BitmapTable" );
|
||||
uno::Sequence< OUString > aServices( &aServiceName, 1 );
|
||||
return aServices;
|
||||
return { "com.sun.star.drawing.BitmapTable" };
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
|
|
@ -533,9 +533,7 @@ sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceNa
|
|||
|
||||
uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames()
|
||||
{
|
||||
OUString aSN("com.sun.star.drawing.DrawingDocument");
|
||||
uno::Sequence< OUString > aSeq( &aSN, 1 );
|
||||
return aSeq;
|
||||
return { "com.sun.star.drawing.DrawingDocument" };
|
||||
}
|
||||
|
||||
// XAnyCompareFactory
|
||||
|
@ -666,9 +664,7 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& Servic
|
|||
|
||||
uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNames( )
|
||||
{
|
||||
OUString aService( "com.sun.star.drawing.DrawPages" );
|
||||
uno::Sequence< OUString > aSeq( &aService, 1 );
|
||||
return aSeq;
|
||||
return { "com.sun.star.drawing.DrawPages" };
|
||||
}
|
||||
|
||||
css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(SdrModel* pModel)
|
||||
|
|
|
@ -246,10 +246,7 @@ sal_Bool SAL_CALL SvxShapeCollection::supportsService( const OUString& ServiceNa
|
|||
|
||||
uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames()
|
||||
{
|
||||
uno::Sequence< OUString > aSeq(2);
|
||||
aSeq.getArray()[0] = "com.sun.star.drawing.Shapes";
|
||||
aSeq.getArray()[1] = "com.sun.star.drawing.ShapeCollection";
|
||||
return aSeq;
|
||||
return { "com.sun.star.drawing.Shapes", "com.sun.star.drawing.ShapeCollection" };
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1102,11 +1102,9 @@ sal_Bool SAL_CALL SvXMLGraphicImportExportHelper::supportsService( const OUStrin
|
|||
|
||||
Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServiceNames()
|
||||
{
|
||||
Sequence< OUString > aSupportedServiceNames(3);
|
||||
aSupportedServiceNames[0] = "com.sun.star.document.GraphicObjectResolver";
|
||||
aSupportedServiceNames[1] = "com.sun.star.document.GraphicStorageHandler";
|
||||
aSupportedServiceNames[2] = "com.sun.star.document.BinaryStreamResolver";
|
||||
return aSupportedServiceNames;
|
||||
return { "com.sun.star.document.GraphicObjectResolver",
|
||||
"com.sun.star.document.GraphicStorageHandler",
|
||||
"com.sun.star.document.BinaryStreamResolver" };
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue