Upcoming improved loplugin:staticanonymous -> redundantstatic: sw

Change-Id: Id4e6e18b1fce848972e67ca519cbf23eab7cd109
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97701
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

6 files changed, 12 insertions, 12 deletions

diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index 7ca58df40551..262fda8f54d7 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -212,7 +212,7 @@ void SwFrameStyleEventDescriptor::setMacroItem(const SvxMacroItem& rItem)
     m_rStyle.SetItem(RES_FRMMACRO, rItem);
 }
 
-static const SvxMacroItem aEmptyMacroItem(RES_FRMMACRO);
+const SvxMacroItem aEmptyMacroItem(RES_FRMMACRO);
 
 const SvxMacroItem& SwFrameStyleEventDescriptor::getMacroItem()
 {
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index d6c9e5a926fd..87c8e7b1a876 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -93,7 +93,7 @@ using namespace nsSwDocInfoSubType;
 #define COM_TEXT_FLDMASTER_CC   "com.sun.star.text.fieldmaster."
 
 // note: this thing is indexed as an array, so do not insert/remove entries!
-static const sal_uInt16 aDocInfoSubTypeFromService[] =
+const sal_uInt16 aDocInfoSubTypeFromService[] =
 {
     DI_CHANGE | DI_SUB_AUTHOR,  //PROPERTY_MAP_FLDTYP_DOCINFO_CHANGE_AUTHOR
     DI_CHANGE | DI_SUB_DATE,    //PROPERTY_MAP_FLDTYP_DOCINFO_CHANGE_DATE_TIME
@@ -124,7 +124,7 @@ struct ServiceIdResId
 
 }
 
-static const ServiceIdResId aServiceToRes[] =
+const ServiceIdResId aServiceToRes[] =
 {
     {SwFieldIds::DateTime,           SwServiceType::FieldTypeDateTime              },
     {SwFieldIds::User,               SwServiceType::FieldTypeUser                  },
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index f9efe7742012..2cf0d0b507f9 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -189,7 +189,7 @@ SwXFootnote::getImplementationName()
     return "SwXFootnote";
 }
 
-static char const*const g_ServicesFootnote[] =
+char const*const g_ServicesFootnote[] =
 {
     "com.sun.star.text.TextContent",
     "com.sun.star.text.Footnote",
@@ -197,9 +197,9 @@ static char const*const g_ServicesFootnote[] =
     "com.sun.star.text.Endnote", // NB: only supported for endnotes!
 };
 
-static const size_t g_nServicesEndnote( SAL_N_ELEMENTS(g_ServicesFootnote) );
+const size_t g_nServicesEndnote( SAL_N_ELEMENTS(g_ServicesFootnote) );
 
-static const size_t g_nServicesFootnote( g_nServicesEndnote - 1 ); // NB: omit!
+const size_t g_nServicesFootnote( g_nServicesEndnote - 1 ); // NB: omit!
 
 sal_Bool SAL_CALL SwXFootnote::supportsService(const OUString& rServiceName)
 {
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 82e42e167ce9..5121d1d9c104 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -119,8 +119,8 @@ lcl_ReAssignTOXType(SwDoc* pDoc, SwTOXBase& rTOXBase, const OUString& rNewName)
     rTOXBase.RegisterToTOXType( *const_cast<SwTOXType*>(pNewType) );
 }
 
-static const char cUserDefined[] = "User-Defined";
-static const char cUserSuffix[] = " (user)";
+const char cUserDefined[] = "User-Defined";
+const char cUserSuffix[] = " (user)";
 #define USER_LEN 12
 #define USER_AND_SUFFIXLEN 19
 
@@ -2650,7 +2650,7 @@ struct TokenType_ {
 
 }
 
-static const struct TokenType_ g_TokenTypes[] =
+const struct TokenType_ g_TokenTypes[] =
 {
     { "TokenEntryNumber",           TOKEN_ENTRY_NO  },
     { "TokenEntryText",             TOKEN_ENTRY_TEXT },
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 81f1a6a2e33a..b392c42f1b88 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1003,7 +1003,7 @@ void SwXLineNumberingProperties::removeVetoableChangeListener(const OUString& /*
 OSL_FAIL("not implemented");
 }
 
-static const char aInvalidStyle[] = "__XXX___invalid";
+const char aInvalidStyle[] = "__XXX___invalid";
 
 class SwXNumberingRules::Impl
     : public SvtListener
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index fedbf6ece9ac..f3feb9973d8a 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -154,7 +154,7 @@ class SwStyleProperties_Impl;
                 , m_fTranslateIndex(fTranslateIndex)
             { }
     };
-    static const std::vector<StyleFamilyEntry>* our_pStyleFamilyEntries;
+    const std::vector<StyleFamilyEntry>* our_pStyleFamilyEntries;
     // these should really be constexprs, but MSVC still is apparently too stupid for them
     #define nPoolChrNormalRange (RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN)
     #define nPoolChrHtmlRange   (RES_POOLCHR_HTML_END   - RES_POOLCHR_HTML_BEGIN)
@@ -185,7 +185,7 @@ class SwStyleProperties_Impl;
                 , m_nCollectionBits(nCollectionBits)
             { }
     };
-    static const std::vector<ParagraphStyleCategoryEntry>* our_pParagraphStyleCategoryEntries;
+    const std::vector<ParagraphStyleCategoryEntry>* our_pParagraphStyleCategoryEntries;
 }
 static const std::vector<StyleFamilyEntry>* lcl_GetStyleFamilyEntries();