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

[Stephan Bergmann (via logerrit)]

 svl/source/inc/poolio.hxx       |    2 +-
 svl/source/items/itemset.cxx    |    2 +-
 svl/source/numbers/zforfind.cxx |    6 +++---
 svl/source/numbers/zforlist.cxx |    2 +-
 svl/source/numbers/zformat.cxx  |    6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 6409b5e7115049f7072c66c1dfb3dd1308709fcc
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 2 07:15:13 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 2 09:32:54 2020 +0200

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

diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 021b85924a65..d5da51bc2d99 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -29,7 +29,7 @@
 class SfxPoolItem;
 class SfxItemPoolUser;
 
-static const sal_uInt32 SFX_ITEMS_DEFAULT = 0xfffffffe;
+const sal_uInt32 SFX_ITEMS_DEFAULT = 0xfffffffe;
 
 static bool CompareSortablePoolItems(SfxPoolItem const* lhs, SfxPoolItem const* rhs)
 {
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 180c76a6a4a7..8d7b1e463911 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -32,7 +32,7 @@
 #include <svl/itemiter.hxx>
 #include <svl/whiter.hxx>
 
-static const sal_uInt16 nInitCount = 10; // Single USHORTs => 5 pairs without '0'
+const sal_uInt16 nInitCount = 10; // Single USHORTs => 5 pairs without '0'
 
 namespace
 {
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 73a70c9efc1a..e5dc78fe89b3 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -67,9 +67,9 @@ const sal_uInt8 ImpSvNumberInputScan::nMatchedUsedAsReturn = 0x10;
  * would work, together with the nTimezonePos handling in GetTimeRef(). */
 #define NF_RECOGNIZE_ISO8601_TIMEZONES 0
 
-static const sal_Unicode cNoBreakSpace = 0xA0;
-static const sal_Unicode cNarrowNoBreakSpace = 0x202F;
-static const bool kDefaultEra = true;     // Gregorian CE, positive year
+const sal_Unicode cNoBreakSpace = 0xA0;
+const sal_Unicode cNarrowNoBreakSpace = 0x202F;
+const bool kDefaultEra = true;     // Gregorian CE, positive year
 
 ImpSvNumberInputScan::ImpSvNumberInputScan( SvNumberFormatter* pFormatterP )
         :
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 5a8b5c4744ce..f98996b2085a 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -109,7 +109,7 @@ static_assert( NF_INDEX_TABLE_ENTRIES <= i18npool::nFirstFreeFormatIndex,
 #define UNKNOWN_SUBSTITUTE      LANGUAGE_ENGLISH_US
 
 // Same order as in include/svl/zforlist.hxx enum NfIndexTableOffset
-static sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] = {
+sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] = {
     ZF_STANDARD, // NF_NUMBER_STANDARD
     ZF_STANDARD + 1, // NF_NUMBER_INT
     ZF_STANDARD + 2, // NF_NUMBER_DEC2
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 33026a8508b5..ca32b95f0345 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -67,7 +67,7 @@ const double D_MAX_U_INT32 = double(0xffffffff);      // 4294967295.0
 const double D_MAX_D_BY_100  = 1.7E306;
 const double D_MIN_M_BY_1000 = 2.3E-305;
 
-static const sal_uInt8 cCharWidths[ 128-32 ] = {
+const sal_uInt8 cCharWidths[ 128-32 ] = {
     1,1,1,2,2,3,2,1,1,1,1,2,1,1,1,1,
     2,2,2,2,2,2,2,2,2,2,1,1,2,2,2,2,
     3,2,2,2,2,2,2,3,2,1,2,2,2,3,3,3,
@@ -138,7 +138,7 @@ void ImpSvNumberformatInfo::Copy( const ImpSvNumberformatInfo& rNumFor, sal_uInt
     nCntExp      = rNumFor.nCntExp;
 }
 
-static const std::map<LanguageType, std::array<sal_uInt8, 4>> tblDBNumToNatNum
+const std::map<LanguageType, std::array<sal_uInt8, 4>> tblDBNumToNatNum
     = { { primary(LANGUAGE_CHINESE),    { 4, 5, 3, 0 } },
         { primary(LANGUAGE_JAPANESE),   { 4, 5, 3, 0 } },
         { primary(LANGUAGE_KOREAN),     { 4, 5, 6, 10 } } };
@@ -173,7 +173,7 @@ sal_uInt8 SvNumberNatNum::MapDBNumToNatNum( sal_uInt8 nDBNum, LanguageType eLang
     return nNatNum;
 }
 
-static const std::map<LanguageType, std::array<sal_uInt8, 9>> tblNatNumToDBNum
+const std::map<LanguageType, std::array<sal_uInt8, 9>> tblNatNumToDBNum
     = { { primary(LANGUAGE_CHINESE),    { 1, 0, 0, 1, 2, 3, 0, 0, 0 } },
         { primary(LANGUAGE_JAPANESE),   { 1, 2, 3, 1, 2, 3, 1, 2, 0 } },
         { primary(LANGUAGE_KOREAN),     { 1, 2, 3, 1, 2, 3, 1, 2, 4 } } };