Kaydet (Commit) e59015ef authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Michael Stahl

Simplify code constructing uno::Sequence<OUString> by initializer_list

Change-Id: I17ef35da6feda65534bbb7d3cc9346d679613618
Reviewed-on: https://gerrit.libreoffice.org/14837Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 0845cdbd
......@@ -788,13 +788,12 @@ sal_Bool SAL_CALL SmGraphicAccessible::supportsService(
Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
Sequence< OUString > aNames(4);
OUString *pNames = aNames.getArray();
pNames[0] = "com::sun::star::accessibility::Accessible";
pNames[1] = "com::sun::star::accessibility::AccessibleComponent";
pNames[2] = "com::sun::star::accessibility::AccessibleContext";
pNames[3] = "com::sun::star::accessibility::AccessibleText";
return aNames;
return Sequence< OUString >{
"com::sun::star::accessibility::Accessible",
"com::sun::star::accessibility::AccessibleComponent",
"com::sun::star::accessibility::AccessibleContext",
"com::sun::star::accessibility::AccessibleText"
};
}
......@@ -1925,12 +1924,11 @@ sal_Bool SAL_CALL SmEditAccessible::supportsService(
Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
Sequence< OUString > aNames(3);
OUString *pNames = aNames.getArray();
pNames[0] = "com::sun::star::accessibility::Accessible";
pNames[1] = "com::sun::star::accessibility::AccessibleComponent";
pNames[2] = "com::sun::star::accessibility::AccessibleContext";
return aNames;
return Sequence< OUString >{
"com::sun::star::accessibility::Accessible",
"com::sun::star::accessibility::AccessibleComponent",
"com::sun::star::accessibility::AccessibleContext"
};
}
......
......@@ -139,9 +139,7 @@ Sequence< OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw(
/* Helper for XServiceInfo */
Sequence< OUString > SmFilterDetect::impl_getStaticSupportedServiceNames()
{
Sequence< OUString > seqServiceNames( 1 );
seqServiceNames.getArray() [0] = "com.sun.star.frame.ExtendedTypeDetection";
return seqServiceNames ;
return Sequence< OUString >{ "com.sun.star.frame.ExtendedTypeDetection" };
}
/* Helper for XServiceInfo */
......
......@@ -111,18 +111,21 @@ SmPrintUIOptions::SmPrintUIOptions()
m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("size", aLocalizedStrings.GetString(5), OUString());
// create a radio button group for print format (matches to SID_PRINTSIZE)
Sequence< OUString > aChoices( 3 );
aChoices[0] = aLocalizedStrings.GetString( 6 );
aChoices[1] = aLocalizedStrings.GetString( 7 );
aChoices[2] = aLocalizedStrings.GetString( 8 );
Sequence< OUString > aHelpIds( 3 );
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0";
aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1";
aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2";
Sequence< OUString > aWidgetIds( 3 );
aWidgetIds[0] = "originalsize";
aWidgetIds[1] = "fittopage";
aWidgetIds[2] = "scaling";
Sequence< OUString > aChoices{
aLocalizedStrings.GetString( 6 ),
aLocalizedStrings.GetString( 7 ),
aLocalizedStrings.GetString( 8 )
};
Sequence< OUString > aHelpIds{
".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0",
".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1",
".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2"
};
Sequence< OUString > aWidgetIds{
"originalsize",
"fittopage",
"scaling"
};
OUString aPrintFormatProp( PRTUIOPT_PRINT_FORMAT );
m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(),
aHelpIds,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment