[Libreoffice-commits] core.git: desktop/test

[Stephan Bergmann (via logerrit)]

 desktop/test/deployment/active/active_native.cxx   |    7 ++++---
 desktop/test/deployment/passive/passive_native.cxx |    7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e208ce965817fb3314634f9087a9989e047b12a5
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Mar 8 09:46:58 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Mar 8 15:46:29 2021 +0100

    Fix build of Extension_test-{active,passive}
    
    Partial reverts of 1553d3787cbe0cdababf31382bf3376a3640d8cf "use for-range on
    Sequence in d*" and e37e990650694d7d3a44a38a6bf23751bb33da67 "tdf#88205 Adapt
    uses of css::uno::Sequence to use initializer_list ctor", plus
    loplugin:redundantstatic.
    
    Change-Id: Icf934bd21b0649d8fe9e88a453b6fc4d821ab6d2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112156
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index 662ff2c16742..753f0da77312 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -107,7 +107,8 @@ rtl::OUString Provider::static_getImplementationName() {
 
 css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-    return css::uno::Sequence< rtl::OUString >{"com.sun.star.test.deployment.active_native"};
+    rtl::OUString name("com.sun.star.test.deployment.active_native");
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
@@ -135,7 +136,7 @@ Provider::queryDispatches(
 {
     css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
         Requests.getLength());
-    for (sal_Int32 i = 0; i < s.(); ++i) {
+    for (sal_Int32 i = 0; i < s.getLength(); ++i) {
         s[i] = queryDispatch(
             Requests[i].FeatureURL, Requests[i].FrameName,
             Requests[i].SearchFlags);
@@ -221,7 +222,7 @@ void Dispatch::dispatch(
     xComponent->dispose();
 }
 
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
     { &Provider::static_create, &Provider::static_getImplementationName,
       &Provider::static_getSupportedServiceNames,
       &cppu::createSingleComponentFactory, nullptr, 0 },
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index 6af233a72d56..9bfbcb7b160f 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -104,7 +104,8 @@ rtl::OUString Provider::static_getImplementationName() {
 
 css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
 {
-    return css::uno::Sequence< rtl::OUString >{"com.sun.star.test.deployment.passive_native"};
+    rtl::OUString name("com.sun.star.test.deployment.passive_native");
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
@@ -132,7 +133,7 @@ Provider::queryDispatches(
 {
     css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > s(
         Requests.getLength());
-    for (sal_Int32 i = 0; i < s.(); ++i) {
+    for (sal_Int32 i = 0; i < s.getLength(); ++i) {
         s[i] = queryDispatch(
             Requests[i].FeatureURL, Requests[i].FrameName,
             Requests[i].SearchFlags);
@@ -218,7 +219,7 @@ void Dispatch::dispatch(
     xComponent->dispose();
 }
 
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
     { &Provider::static_create, &Provider::static_getImplementationName,
       &Provider::static_getSupportedServiceNames,
       &cppu::createSingleComponentFactory, nullptr, 0 },