Kaydet (Commit) 9dd8510e authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Stephan Bergmann

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

in starmath.

Change-Id: I823b352b2b6bdc247bdb3ce875953430546a3be8
Signed-off-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 44337a1f
......@@ -401,9 +401,7 @@ OUString SAL_CALL SmXMLExport_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL SmXMLExport_getSupportedServiceNames()
throw()
{
const OUString aServiceName( EXPORT_SVC_NAME );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
}
uno::Reference< uno::XInterface > SAL_CALL SmXMLExport_createInstance(
......@@ -424,9 +422,7 @@ OUString SAL_CALL SmXMLExportMetaOOO_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL SmXMLExportMetaOOO_getSupportedServiceNames()
throw()
{
const OUString aServiceName( EXPORT_SVC_NAME );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
}
uno::Reference< uno::XInterface > SAL_CALL SmXMLExportMetaOOO_createInstance(
......@@ -444,9 +440,7 @@ OUString SAL_CALL SmXMLExportMeta_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL SmXMLExportMeta_getSupportedServiceNames()
throw()
{
const OUString aServiceName( EXPORT_SVC_NAME );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
}
uno::Reference< uno::XInterface > SAL_CALL SmXMLExportMeta_createInstance(
......@@ -464,9 +458,7 @@ OUString SAL_CALL SmXMLExportSettingsOOO_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL SmXMLExportSettingsOOO_getSupportedServiceNames()
throw()
{
const OUString aServiceName( EXPORT_SVC_NAME );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
}
uno::Reference< uno::XInterface > SAL_CALL SmXMLExportSettingsOOO_createInstance(
......@@ -484,9 +476,7 @@ OUString SAL_CALL SmXMLExportSettings_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL SmXMLExportSettings_getSupportedServiceNames()
throw()
{
const OUString aServiceName( EXPORT_SVC_NAME );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
}
uno::Reference< uno::XInterface > SAL_CALL SmXMLExportSettings_createInstance(
......@@ -504,9 +494,7 @@ OUString SAL_CALL SmXMLExportContent_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL SmXMLExportContent_getSupportedServiceNames()
throw()
{
const OUString aServiceName( EXPORT_SVC_NAME );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
}
uno::Reference< uno::XInterface > SAL_CALL SmXMLExportContent_createInstance(
......
......@@ -431,9 +431,7 @@ OUString SAL_CALL SmXMLImport_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL SmXMLImport_getSupportedServiceNames()
throw()
{
const OUString aServiceName( IMPORT_SVC_NAME );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
return uno::Sequence<OUString>{ IMPORT_SVC_NAME };
}
uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance(
......@@ -453,9 +451,7 @@ OUString SAL_CALL SmXMLImportMeta_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL SmXMLImportMeta_getSupportedServiceNames()
throw()
{
const OUString aServiceName( IMPORT_SVC_NAME );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
return uno::Sequence<OUString>{ IMPORT_SVC_NAME };
}
uno::Reference< uno::XInterface > SAL_CALL SmXMLImportMeta_createInstance(
......@@ -475,9 +471,7 @@ OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL SmXMLImportSettings_getSupportedServiceNames()
throw()
{
const OUString aServiceName( IMPORT_SVC_NAME );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
return uno::Sequence<OUString>{ IMPORT_SVC_NAME };
}
uno::Reference< uno::XInterface > SAL_CALL SmXMLImportSettings_createInstance(
......
......@@ -36,9 +36,7 @@ OUString SAL_CALL SmDocument_getImplementationName() throw()
uno::Sequence< OUString > SAL_CALL SmDocument_getSupportedServiceNames() throw()
{
uno::Sequence< OUString > aSeq( 1 );
aSeq[0] = "com.sun.star.formula.FormulaProperties";
return aSeq;
return uno::Sequence<OUString>{ "com.sun.star.formula.FormulaProperties" };
}
uno::Reference< uno::XInterface > SAL_CALL SmDocument_createInstance(
......
......@@ -422,11 +422,10 @@ uno::Sequence< OUString > SmModel::getSupportedServiceNames_Static(void)
{
SolarMutexGuard aGuard;
uno::Sequence< OUString > aRet(2);
OUString* pArray = aRet.getArray();
pArray[0] = "com.sun.star.document.OfficeDocument";
pArray[1] = "com.sun.star.formula.FormulaProperties";
return aRet;
return uno::Sequence<OUString>{
"com.sun.star.document.OfficeDocument",
"com.sun.star.formula.FormulaProperties"
};
}
void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* pValues)
......
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