summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scaddins/source/analysis/analysis.cxx6
-rw-r--r--scaddins/source/datefunc/datefunc.cxx6
-rw-r--r--scaddins/source/pricing/pricing.cxx6
-rw-r--r--scripting/source/dlgprov/dlgprov.cxx8
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.cxx5
-rw-r--r--scripting/source/provider/MasterScriptProvider.cxx13
-rw-r--r--scripting/source/provider/MasterScriptProviderFactory.cxx8
-rw-r--r--scripting/source/vbaevents/eventhelper.cxx6
8 files changed, 15 insertions, 43 deletions
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index f9a398a8abb7..9e7cf05aa91c 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -148,11 +148,7 @@ OUString AnalysisAddIn::getImplementationName_Static()
uno::Sequence< OUString > AnalysisAddIn::getSupportedServiceNames_Static()
{
- uno::Sequence< OUString > aRet(2);
- OUString* pArray = aRet.getArray();
- pArray[0] = ADDIN_SERVICE;
- pArray[1] = MY_SERVICE;
- return aRet;
+ return { ADDIN_SERVICE, MY_SERVICE };
}
uno::Reference< uno::XInterface > AnalysisAddIn_CreateInstance(
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 32c785643470..8f3832869266 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -177,11 +177,7 @@ OUString ScaDateAddIn::getImplementationName_Static()
uno::Sequence< OUString > ScaDateAddIn::getSupportedServiceNames_Static()
{
- uno::Sequence< OUString > aRet( 2 );
- OUString* pArray = aRet.getArray();
- pArray[0] = ADDIN_SERVICE;
- pArray[1] = MY_SERVICE;
- return aRet;
+ return { ADDIN_SERVICE, MY_SERVICE };
}
// XServiceName
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index 6c3a6449b0d1..1d0fb69a1011 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -177,11 +177,7 @@ OUString ScaPricingAddIn::getImplementationName_Static()
uno::Sequence< OUString > ScaPricingAddIn::getSupportedServiceNames_Static()
{
- uno::Sequence< OUString > aRet( 2 );
- OUString* pArray = aRet.getArray();
- pArray[0] = ADDIN_SERVICE;
- pArray[1] = MY_SERVICE;
- return aRet;
+ return { ADDIN_SERVICE, MY_SERVICE };
}
// XServiceName
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 59bfbdfe041f..ef5673bafbfd 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -166,11 +166,9 @@ namespace dlgprov
static Sequence< OUString > getSupportedServiceNames_DialogProviderImpl()
{
- Sequence< OUString > aNames(3);
- aNames[0] = "com.sun.star.awt.DialogProvider";
- aNames[1] = "com.sun.star.awt.DialogProvider2";
- aNames[2] = "com.sun.star.awt.ContainerWindowProvider";
- return aNames;
+ return { "com.sun.star.awt.DialogProvider",
+ "com.sun.star.awt.DialogProvider2",
+ "com.sun.star.awt.ContainerWindowProvider" };
}
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index e89452c3c971..92ce1be6c273 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -623,10 +623,7 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy()
Sequence< OUString >
bnf_getSupportedServiceNames( )
{
- OUString str_name(
- "com.sun.star.script.browse.BrowseNodeFactory");
-
- return Sequence< OUString >( &str_name, 1 );
+ return { "com.sun.star.script.browse.BrowseNodeFactory" };
}
OUString
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index ca84b2599888..8fb19dc8ac09 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -688,13 +688,9 @@ static Reference< XInterface > sp_create(
static Sequence< OUString > sp_getSupportedServiceNames( )
{
- OUString names[3];
-
- names[0] = "com.sun.star.script.provider.MasterScriptProvider";
- names[1] = "com.sun.star.script.browse.BrowseNode";
- names[2] = "com.sun.star.script.provider.ScriptProvider";
-
- return Sequence< OUString >( names, 3 );
+ return { "com.sun.star.script.provider.MasterScriptProvider",
+ "com.sun.star.script.browse.BrowseNode",
+ "com.sun.star.script.provider.ScriptProvider" };
}
@@ -718,8 +714,7 @@ static Sequence< OUString > urihelper_getSupportedServiceNames( )
static OUString urihelper_getImplementationName( )
{
- return
- "com.sun.star.script.provider.ScriptURIHelper";
+ return "com.sun.star.script.provider.ScriptURIHelper";
}
static const struct cppu::ImplementationEntry s_entries [] =
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index 3a6d74ac9598..fd93894b6e94 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -64,16 +64,12 @@ MasterScriptProviderFactory::getActiveMSPList() const
Sequence< OUString > mspf_getSupportedServiceNames( )
{
- OUString str_name(
- "com.sun.star.script.provider.MasterScriptProviderFactory");
-
- return Sequence< OUString >( &str_name, 1 );
+ return { "com.sun.star.script.provider.MasterScriptProviderFactory" };
}
OUString mspf_getImplementationName( )
{
- return
- "com.sun.star.script.provider.MasterScriptProviderFactory";
+ return "com.sun.star.script.provider.MasterScriptProviderFactory";
}
Reference< XInterface >
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 7696956fdcc2..c6ba9161a549 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -585,8 +585,7 @@ public:
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
- const OUString strName( getImplementationName() );
- return Sequence< OUString >( &strName, 1 );
+ return { getImplementationName() };
}
protected:
@@ -931,8 +930,7 @@ public:
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
- const OUString strName( getImplementationName() );
- return Sequence< OUString >( &strName, 1 );
+ return { getImplementationName() };
}
};