[Libreoffice-commits] core.git: scripting/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 1 21:44:37 UTC 2020


 scripting/source/basprov/basprov.cxx               |    2 +-
 scripting/source/dlgprov/dlgprov.cxx               |    4 ++--
 scripting/source/provider/MasterScriptProvider.cxx |    2 +-
 scripting/source/provider/URIHelper.cxx            |    8 ++++----
 scripting/source/stringresource/stringresource.cxx |    4 ++--
 scripting/source/vbaevents/eventhelper.cxx         |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 9c6100c26a295bba568f89b2eb0ade104ddb2069
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jul 1 21:24:52 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 1 23:43:58 2020 +0200

    Upcoming improved loplugin:staticanonymous -> redundantstatic: scripting
    
    Change-Id: Iee244e5b7f3f768d2e58165ae438824a1f1a0d0d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97654
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 6c7ede60649f..bd1832ba98ba 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -492,7 +492,7 @@ namespace basprov
     }
 
 
-    static struct ::cppu::ImplementationEntry const s_component_entries [] =
+    struct ::cppu::ImplementationEntry const s_component_entries [] =
     {
         {
             create_BasicProviderImpl, getImplementationName_BasicProviderImpl,
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 2f120497cf28..2117982e7c39 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -593,7 +593,7 @@ namespace dlgprov
     // XDialogProvider
 
 
-    static const char aDecorationPropName[] = "Decoration";
+    const char aDecorationPropName[] = "Decoration";
 
     Reference < XControl > DialogProviderImpl::createDialogImpl(
         const OUString& URL, const Reference< XInterface >& xHandler,
@@ -735,7 +735,7 @@ namespace dlgprov
     }
 
 
-    static struct ::cppu::ImplementationEntry const s_component_entries [] =
+    struct ::cppu::ImplementationEntry const s_component_entries [] =
     {
         {create_DialogProviderImpl, getImplementationName_DialogProviderImpl,getSupportedServiceNames_DialogProviderImpl, ::cppu::createSingleComponentFactory,nullptr, 0},
         { &comp_DialogModelProvider::_create,&comp_DialogModelProvider::_getImplementationName,&comp_DialogModelProvider::_getSupportedServiceNames,&::cppu::createSingleComponentFactory, nullptr, 0 },
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 0ed11a20348f..0f4429d2dd79 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -709,7 +709,7 @@ static OUString urihelper_getImplementationName( )
     return "com.sun.star.script.provider.ScriptURIHelper";
 }
 
-static const struct cppu::ImplementationEntry s_entries [] =
+const struct cppu::ImplementationEntry s_entries [] =
     {
         {
             sp_create, sp_getImplementationName,
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 1497df6b92a8..f9c07a741b64 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -35,13 +35,13 @@ namespace ucb = ::com::sun::star::ucb;
 namespace lang = ::com::sun::star::lang;
 namespace uri = ::com::sun::star::uri;
 
-static const char SHARE[] = "share";
+const char SHARE[] = "share";
 
-static const char SHARE_UNO_PACKAGES_URI[] =
+const char SHARE_UNO_PACKAGES_URI[] =
     "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE";
 
-static const char USER[] = "user";
-static const char USER_URI[] =
+const char USER[] = "user";
+const char USER_URI[] =
     "vnd.sun.star.expand:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
 
 
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 4d4bcb1c045e..dc8b38466416 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -697,7 +697,7 @@ Sequence< OUString > StringResourcePersistenceImpl::getSupportedServiceNames(  )
 // XInitialization base functionality for derived classes
 
 
-static const char aNameBaseDefaultStr[] = "strings";
+const char aNameBaseDefaultStr[] = "strings";
 
 void StringResourcePersistenceImpl::implInitializeCommonParameters
     ( const Sequence< Any >& aArguments )
@@ -2656,7 +2656,7 @@ const Reference< ucb::XSimpleFileAccess3 > & StringResourceWithLocationImpl::get
 // component export operations
 
 
-static const struct ::cppu::ImplementationEntry s_component_entries [] =
+const struct ::cppu::ImplementationEntry s_component_entries [] =
 {
     {
         create_StringResourceImpl, getImplementationName_StringResourceImpl,
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 408f45689898..5fdbe8c078cf 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -76,8 +76,8 @@ using namespace ::com::sun::star::uno;
 using namespace ::ooo::vba;
 
 // Some constants
-static const char DELIM[] = "::";
-static const sal_Int32 DELIMLEN = strlen(DELIM);
+const char DELIM[] = "::";
+const sal_Int32 DELIMLEN = strlen(DELIM);
 
 static bool isKeyEventOk( awt::KeyEvent& evt, const Sequence< Any >& params )
 {


More information about the Libreoffice-commits mailing list