summaryrefslogtreecommitdiffstats
path: root/starmath
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2015-03-12 17:09:33 +0900
committerMichael Stahl <mstahl@redhat.com>2015-03-13 14:04:26 +0000
commite59015ef832178451ba2fca2fe7054fcf5090e9a (patch)
treef21189b4f2803c20f0248ea27496bce035d00b76 /starmath
parentCppCheck cleaning : redundant checking of elemet existence (diff)
downloadcore-e59015ef832178451ba2fca2fe7054fcf5090e9a.tar.gz
core-e59015ef832178451ba2fca2fe7054fcf5090e9a.zip
Simplify code constructing uno::Sequence<OUString> by initializer_list
Change-Id: I17ef35da6feda65534bbb7d3cc9346d679613618 Reviewed-on: https://gerrit.libreoffice.org/14837 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/source/accessibility.cxx24
-rw-r--r--starmath/source/smdetect.cxx4
-rw-r--r--starmath/source/unomodel.cxx27
3 files changed, 27 insertions, 28 deletions
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 1604ceefef71..6973dfda16b1 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -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"
+ };
}
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 27982f9db742..03ca462db359 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -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 */
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index f85e044c0182..8e617e348d3c 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -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,