stoc/source/corereflection/crbase.cxx | 2 -
stoc/source/implementationregistration/implreg.cxx | 22 ++++++++++----------
stoc/source/invocation/invocation.cxx | 2 -
stoc/source/invocation_adapterfactory/iafactory.cxx | 2 -
stoc/source/javaloader/javaloader.cxx | 2 -
stoc/source/namingservice/namingservice.cxx | 2 -
stoc/source/proxy_factory/proxyfac.cxx | 2 -
stoc/source/security/access_controller.cxx | 2 -
8 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 45898370bcf0dfb8bd303dc0922ebae604d59224
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jul 2 07:13:23 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jul 2 08:10:25 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: stoc
Change-Id: I993e4c0aef41b0925678d7744a989ad5539cc80e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97693
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/stoc/source/corereflection/crbase.cxx
b/stoc/source/corereflection/crbase.cxx
index c179324050c4..75e802c96045 100644
--- a/stoc/source/corereflection/crbase.cxx
+++ b/stoc/source/corereflection/crbase.cxx
@@ -93,7 +93,7 @@ sal_Bool IdlClassImpl::equals( const Reference< XIdlClass >&
xType )
(xType->getTypeClass() == _eTypeClass) && (xType->getName() ==
_aName));
}
-static const bool s_aAssignableFromTab[11][11] =
+const bool s_aAssignableFromTab[11][11] =
{
/* from CH, BO, BY, SH, US, LO,
UL, HY, UH, FL, DO */
/* TypeClass_CHAR */ { true, false, false, false, false, false,
false, false, false, false, false },
diff --git a/stoc/source/implementationregistration/implreg.cxx
b/stoc/source/implementationregistration/implreg.cxx
index dc21f55663c3..0d9cfb80ffda 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -56,27 +56,27 @@ using namespace osl;
namespace {
-static constexpr OUStringLiteral slash_UNO_slash_REGISTRY_LINKS
+constexpr OUStringLiteral slash_UNO_slash_REGISTRY_LINKS
= "/UNO/REGISTRY_LINKS";
-static constexpr OUStringLiteral slash_IMPLEMENTATIONS
+constexpr OUStringLiteral slash_IMPLEMENTATIONS
= "/IMPLEMENTATIONS";
-static constexpr OUStringLiteral slash_UNO
+constexpr OUStringLiteral slash_UNO
= "/UNO";
-static constexpr OUStringLiteral slash_UNO_slash_SERVICES
+constexpr OUStringLiteral slash_UNO_slash_SERVICES
= "/UNO/SERVICES";
-static constexpr OUStringLiteral slash_UNO_slash_SINGLETONS
+constexpr OUStringLiteral slash_UNO_slash_SINGLETONS
= "/UNO/SINGLETONS";
-static constexpr OUStringLiteral slash_SERVICES
+constexpr OUStringLiteral slash_SERVICES
= "/SERVICES/";
-static constexpr OUStringLiteral slash_UNO_slash_LOCATION
+constexpr OUStringLiteral slash_UNO_slash_LOCATION
= "/UNO/LOCATION";
-static constexpr OUStringLiteral slash_UNO_slash_ACTIVATOR
+constexpr OUStringLiteral slash_UNO_slash_ACTIVATOR
= "/UNO/ACTIVATOR";
-static constexpr OUStringLiteral colon_old
+constexpr OUStringLiteral colon_old
= ":old";
-static constexpr OUStringLiteral com_sun_star_registry_SimpleRegistry
+constexpr OUStringLiteral com_sun_star_registry_SimpleRegistry
= "com.sun.star.registry.SimpleRegistry";
-static constexpr OUStringLiteral Registry
+constexpr OUStringLiteral Registry
= "Registry";
// static deleteAllLinkReferences()
diff --git a/stoc/source/invocation/invocation.cxx
b/stoc/source/invocation/invocation.cxx
index 8027442aa9b2..c2fb1d0d280f 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -1109,7 +1109,7 @@ static Reference<XInterface>
InvocationService_CreateInstance( const Reference<X
}
using namespace stoc_inv;
-static const struct ImplementationEntry g_entries[] =
+const struct ImplementationEntry g_entries[] =
{
{
InvocationService_CreateInstance, inv_getImplementationName,
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index e6a66cf8d126..cfa05e15e585 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -892,7 +892,7 @@ static Reference< XInterface > FactoryImpl_create(
}
-static const struct ::cppu::ImplementationEntry g_entries[] =
+const struct ::cppu::ImplementationEntry g_entries[] =
{
{
::stoc_invadp::FactoryImpl_create,
diff --git a/stoc/source/javaloader/javaloader.cxx
b/stoc/source/javaloader/javaloader.cxx
index d6f77cd2be1d..191703b103c0 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -350,7 +350,7 @@ static css::uno::Reference<XInterface>
JavaComponentLoader_CreateInstance(const
using namespace stoc_javaloader;
-static const struct ImplementationEntry g_entries[] =
+const struct ImplementationEntry g_entries[] =
{
{
JavaComponentLoader_CreateInstance, loader_getImplementationName,
diff --git a/stoc/source/namingservice/namingservice.cxx
b/stoc/source/namingservice/namingservice.cxx
index b58212e2c176..cfecc0a7c795 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -134,7 +134,7 @@ void NamingService_Impl::revokeObject( const OUString& Name
)
}
using namespace stoc_namingservice;
-static const struct ImplementationEntry g_entries[] =
+const struct ImplementationEntry g_entries[] =
{
{
NamingService_Impl_create, ns_getImplementationName,
diff --git a/stoc/source/proxy_factory/proxyfac.cxx
b/stoc/source/proxy_factory/proxyfac.cxx
index eac0c2a5965b..9c3afd927d03 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -432,7 +432,7 @@ Reference< XInterface > proxyfac_create(
return xRet;
}
-static const ::cppu::ImplementationEntry g_entries [] =
+const ::cppu::ImplementationEntry g_entries [] =
{
{
proxyfac_create, proxyfac_getImplementationName,
diff --git a/stoc/source/security/access_controller.cxx
b/stoc/source/security/access_controller.cxx
index c9387e7514b3..856c493a355f 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -62,7 +62,7 @@ using namespace stoc_sec;
namespace {
// static stuff initialized when loading lib
-static OUString s_envType = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+OUString s_envType = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
const char s_acRestriction[] = "access-control.restriction";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
