diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 09:24:18 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 10:45:17 +0200 |
commit | b772fca5b5fc24df8150541a08ac1bfd979b3ac9 (patch) | |
tree | cffb832238b5155a86c025aef7ddb4e0df61349d /toolkit/source | |
parent | b32e5bbdc620ac9cf8b241ada47640f9e1d5d408 (diff) |
Upcoming improved loplugin:staticanonymous -> redundantstatic: toolkit
Change-Id: I40eb6de30065fe00d5214e0a00b38d02b0deea52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97708
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'toolkit/source')
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 8 | ||||
-rw-r--r-- | toolkit/source/controls/formattedcontrol.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrol.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/helper/accessibilityclient.cxx | 6 | ||||
-rw-r--r-- | toolkit/source/helper/formpdfexport.cxx | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 4b4efaece266..eee471e9894e 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -691,7 +691,7 @@ struct ComponentInfo WindowType nWinType; }; -static ComponentInfo const aComponentInfos [] = +ComponentInfo const aComponentInfos [] = { { OUStringLiteral("animatedimages"), WindowType::CONTROL }, { OUStringLiteral("buttondialog"), WindowType::BUTTONDIALOG }, @@ -809,7 +809,7 @@ struct MessageBoxTypeInfo sal_Int32 nLen; }; -static const MessageBoxTypeInfo aMessageBoxTypeInfo[] = +const MessageBoxTypeInfo aMessageBoxTypeInfo[] = { { css::awt::MessageBoxType_MESSAGEBOX, RTL_CONSTASCII_STRINGPARAM("messbox") }, { css::awt::MessageBoxType_INFOBOX, RTL_CONSTASCII_STRINGPARAM("infobox") }, @@ -842,8 +842,8 @@ bool lcl_convertMessageBoxType( #ifndef IOS -static sal_Int32 nVCLToolkitInstanceCount = 0; -static bool bInitedByVCLToolkit = false; +sal_Int32 nVCLToolkitInstanceCount = 0; +bool bInitedByVCLToolkit = false; osl::Mutex & getInitMutex() { diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 015b38e1f7b6..b438833557ad 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -60,7 +60,7 @@ namespace toolkit } - static bool s_bTriedCreation = false; + bool s_bTriedCreation = false; const Reference< XNumberFormatsSupplier >& lcl_getDefaultFormats_throw() { @@ -79,7 +79,7 @@ namespace toolkit } - static oslInterlockedCount s_refCount(0); + oslInterlockedCount s_refCount(0); void lcl_registerDefaultFormatsClient() diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 71132338cfbb..aeb84bd8139a 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -63,7 +63,7 @@ struct LanguageDependentProp } -static const LanguageDependentProp aLanguageDependentProp[] = +const LanguageDependentProp aLanguageDependentProp[] = { { "Text", 4 }, { "Label", 5 }, diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index 682354607111..9d795ac620e4 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -38,12 +38,12 @@ namespace toolkit namespace { #ifndef DISABLE_DYNLOADING - static oslModule s_hAccessibleImplementationModule = nullptr; + oslModule s_hAccessibleImplementationModule = nullptr; #endif #if HAVE_FEATURE_DESKTOP - static GetStandardAccComponentFactory s_pAccessibleFactoryFunc = nullptr; + GetStandardAccComponentFactory s_pAccessibleFactoryFunc = nullptr; #endif - static ::rtl::Reference< IAccessibleFactory > s_pFactory; + ::rtl::Reference< IAccessibleFactory > s_pFactory; } diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index a3c74dd1b39e..a265d18dfdf0 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -58,7 +58,7 @@ namespace toolkitform using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; - static const char FM_PROP_NAME[] = "Name"; + const char FM_PROP_NAME[] = "Name"; namespace { |