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( ...@@ -788,13 +788,12 @@ sal_Bool SAL_CALL SmGraphicAccessible::supportsService(
Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames() Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames()
throw (RuntimeException, std::exception) throw (RuntimeException, std::exception)
{ {
Sequence< OUString > aNames(4); return Sequence< OUString >{
OUString *pNames = aNames.getArray(); "com::sun::star::accessibility::Accessible",
pNames[0] = "com::sun::star::accessibility::Accessible"; "com::sun::star::accessibility::AccessibleComponent",
pNames[1] = "com::sun::star::accessibility::AccessibleComponent"; "com::sun::star::accessibility::AccessibleContext",
pNames[2] = "com::sun::star::accessibility::AccessibleContext"; "com::sun::star::accessibility::AccessibleText"
pNames[3] = "com::sun::star::accessibility::AccessibleText"; };
return aNames;
} }
...@@ -1925,12 +1924,11 @@ sal_Bool SAL_CALL SmEditAccessible::supportsService( ...@@ -1925,12 +1924,11 @@ sal_Bool SAL_CALL SmEditAccessible::supportsService(
Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames() Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames()
throw (RuntimeException, std::exception) throw (RuntimeException, std::exception)
{ {
Sequence< OUString > aNames(3); return Sequence< OUString >{
OUString *pNames = aNames.getArray(); "com::sun::star::accessibility::Accessible",
pNames[0] = "com::sun::star::accessibility::Accessible"; "com::sun::star::accessibility::AccessibleComponent",
pNames[1] = "com::sun::star::accessibility::AccessibleComponent"; "com::sun::star::accessibility::AccessibleContext"
pNames[2] = "com::sun::star::accessibility::AccessibleContext"; };
return aNames;
} }
......
...@@ -139,9 +139,7 @@ Sequence< OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw( ...@@ -139,9 +139,7 @@ Sequence< OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw(
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
Sequence< OUString > SmFilterDetect::impl_getStaticSupportedServiceNames() Sequence< OUString > SmFilterDetect::impl_getStaticSupportedServiceNames()
{ {
Sequence< OUString > seqServiceNames( 1 ); return Sequence< OUString >{ "com.sun.star.frame.ExtendedTypeDetection" };
seqServiceNames.getArray() [0] = "com.sun.star.frame.ExtendedTypeDetection";
return seqServiceNames ;
} }
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
......
...@@ -111,18 +111,21 @@ SmPrintUIOptions::SmPrintUIOptions() ...@@ -111,18 +111,21 @@ SmPrintUIOptions::SmPrintUIOptions()
m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("size", aLocalizedStrings.GetString(5), OUString()); m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("size", aLocalizedStrings.GetString(5), OUString());
// create a radio button group for print format (matches to SID_PRINTSIZE) // create a radio button group for print format (matches to SID_PRINTSIZE)
Sequence< OUString > aChoices( 3 ); Sequence< OUString > aChoices{
aChoices[0] = aLocalizedStrings.GetString( 6 ); aLocalizedStrings.GetString( 6 ),
aChoices[1] = aLocalizedStrings.GetString( 7 ); aLocalizedStrings.GetString( 7 ),
aChoices[2] = aLocalizedStrings.GetString( 8 ); aLocalizedStrings.GetString( 8 )
Sequence< OUString > aHelpIds( 3 ); };
aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0"; Sequence< OUString > aHelpIds{
aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1"; ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0",
aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2"; ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1",
Sequence< OUString > aWidgetIds( 3 ); ".HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2"
aWidgetIds[0] = "originalsize"; };
aWidgetIds[1] = "fittopage"; Sequence< OUString > aWidgetIds{
aWidgetIds[2] = "scaling"; "originalsize",
"fittopage",
"scaling"
};
OUString aPrintFormatProp( PRTUIOPT_PRINT_FORMAT ); OUString aPrintFormatProp( PRTUIOPT_PRINT_FORMAT );
m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(), m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(),
aHelpIds, 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