From 6a9f71f232eb214a4be943b4f6a9e4a228a1ed5c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 1 Jul 2020 13:21:56 +0200 Subject: Upcoming improved loplugin:staticanonymous -> redundantstatic: linguistic Change-Id: I9f179db10c55f41e07c1f7fd519a58d68b7e6ad9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97614 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- linguistic/source/dicimp.cxx | 20 ++++++++++---------- linguistic/source/gciterator.cxx | 8 ++++---- linguistic/source/iprcache.cxx | 2 +- linguistic/source/lngprophelp.cxx | 2 +- linguistic/source/misc.cxx | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'linguistic') diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index ef348f75a594..d29a2bcb0ad3 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -76,16 +76,16 @@ using namespace linguistic; // text stripping and dictionary saving. #define EXTENSION_FOR_TITLE_TEXT "." -static const char* const pVerStr2 = "WBSWG2"; -static const char* const pVerStr5 = "WBSWG5"; -static const char* const pVerStr6 = "WBSWG6"; -static const char* const pVerOOo7 = "OOoUserDict1"; - -static const sal_Int16 DIC_VERSION_DONTKNOW = -1; -static const sal_Int16 DIC_VERSION_2 = 2; -static const sal_Int16 DIC_VERSION_5 = 5; -static const sal_Int16 DIC_VERSION_6 = 6; -static const sal_Int16 DIC_VERSION_7 = 7; +const char* const pVerStr2 = "WBSWG2"; +const char* const pVerStr5 = "WBSWG5"; +const char* const pVerStr6 = "WBSWG6"; +const char* const pVerOOo7 = "OOoUserDict1"; + +const sal_Int16 DIC_VERSION_DONTKNOW = -1; +const sal_Int16 DIC_VERSION_2 = 2; +const sal_Int16 DIC_VERSION_5 = 5; +const sal_Int16 DIC_VERSION_6 = 6; +const sal_Int16 DIC_VERSION_7 = 7; static uno::Reference< XLinguServiceManager2 > GetLngSvcMgr_Impl() { diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index ac8fd2bf2cf4..6e1a5ea0602f 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -68,7 +68,7 @@ static OUString GrammarCheckingIterator_getImplementationName() throw(); static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceNames() throw(); // white space list: obtained from the fonts.config.txt of a Linux system. -static const sal_Unicode aWhiteSpaces[] = +const sal_Unicode aWhiteSpaces[] = { 0x0020, /* SPACE */ 0x00a0, /* NO-BREAK SPACE */ @@ -121,10 +121,10 @@ static const sal_Unicode aWhiteSpaces[] = }; // Information about reason for proofreading (ProofInfo) - static const sal_Int32 PROOFINFO_GET_PROOFRESULT = 1; - static const sal_Int32 PROOFINFO_MARK_PARAGRAPH = 2; + const sal_Int32 PROOFINFO_GET_PROOFRESULT = 1; + const sal_Int32 PROOFINFO_MARK_PARAGRAPH = 2; -static const int nWhiteSpaces = SAL_N_ELEMENTS( aWhiteSpaces ); +const int nWhiteSpaces = SAL_N_ELEMENTS( aWhiteSpaces ); static bool lcl_IsWhiteSpace( sal_Unicode cChar ) { diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index eb49db33892f..14eee1dfc69b 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -39,7 +39,7 @@ namespace linguistic #define NUM_FLUSH_PROPS 6 -static const struct +const struct { const char *pPropName; sal_Int32 nPropHdl; diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 1c066e7eba34..d6681c222228 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -54,7 +54,7 @@ static const char *aCH[] = UPN_IS_USE_DICTIONARY_LIST, }; -static const int nCHCount = SAL_N_ELEMENTS(aCH); +const int nCHCount = SAL_N_ELEMENTS(aCH); PropertyChgHelper::PropertyChgHelper( diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 8024a3b34437..3e0beddada2d 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -625,7 +625,7 @@ OUString ToLower( const OUString &rText, LanguageType nLanguage ) // sorted(!) array of unicode ranges for code points that are exclusively(!) used as numbers // and thus may NOT not be part of names or words like the Chinese/Japanese number characters -static const sal_uInt32 the_aDigitZeroes [] = +const sal_uInt32 the_aDigitZeroes [] = { 0x00000030, //0039 ; Decimal # Nd [10] DIGIT ZERO..DIGIT NINE 0x00000660, //0669 ; Decimal # Nd [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE -- cgit