Improved loplugin:staticanonymous -> redundantstatic redux, clang-cl

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

4 files changed, 13 insertions, 13 deletions

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index ce1a8bd610a0..be4af132db1d 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -65,7 +65,7 @@
 
 using namespace vcl;
 
-static const int MAXFONTHEIGHT = 2048;
+const int MAXFONTHEIGHT = 2048;
 
 static FIXED FixedFromDouble( double d )
 {
@@ -254,7 +254,7 @@ namespace
 // with a font that is supported and always available.
 // Based on:
 // https://dxr.mozilla.org/mozilla-esr10/source/gfx/thebes/gfxDWriteFontList.cpp#1057
-static const std::map<OUString, OUString> aBitmapFontSubs =
+const std::map<OUString, OUString> aBitmapFontSubs =
 {
     { "MS Sans Serif", "Microsoft Sans Serif" },
     { "MS Serif",      "Times New Roman" },
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 7947cd9a6406..053c503b1671 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -87,8 +87,8 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ui::dialogs;
 
-static const wchar_t aImplWindows[] = L"windows";
-static const wchar_t aImplDevice[]  = L"device";
+const wchar_t aImplWindows[] = L"windows";
+const wchar_t aImplDevice[]  = L"device";
 
 static DEVMODEW const * SAL_DEVMODE_W( const ImplJobSetup* pSetupData )
 {
diff --git a/vcl/win/window/keynames.cxx b/vcl/win/window/keynames.cxx
index 0d4f12f82cb8..d1dac8f08c5c 100644
--- a/vcl/win/window/keynames.cxx
+++ b/vcl/win/window/keynames.cxx
@@ -72,7 +72,7 @@ namespace vcl_sal {
     // Every string value in the replacements tables must be in UTF-8
     // but with the UTF-8 bytes encoded, not as such! Be careful!
 
-    static const struct KeysNameReplacement aImplReplacements_Asturian[] =
+    const struct KeysNameReplacement aImplReplacements_Asturian[] =
     {
         { PAPUGA_KEY_BACK, "Retrocesu" },
         { PAPUGA_KEY_ENTER, "Intro" },
@@ -90,7 +90,7 @@ namespace vcl_sal {
         { PAPUGA_KEY_SHIFT, "May\xc3\xba" "s" },
     };
 
-    static const struct KeysNameReplacement aImplReplacements_Catalan[] =
+    const struct KeysNameReplacement aImplReplacements_Catalan[] =
     {
         { PAPUGA_KEY_BACK, "Retroc\xc3\xa9" "s" },
         { PAPUGA_KEY_ENTER, "Retorn" },
@@ -108,7 +108,7 @@ namespace vcl_sal {
         { PAPUGA_KEY_SHIFT, "Maj" },
     };
 
-    static const struct KeysNameReplacement aImplReplacements_Estonian[] =
+    const struct KeysNameReplacement aImplReplacements_Estonian[] =
     {
         { PAPUGA_KEY_RIGHT, "Nool paremale" },
         { PAPUGA_KEY_LEFT, "Nool vasakule" },
@@ -119,7 +119,7 @@ namespace vcl_sal {
         { PAPUGA_KEY_SPACEBAR, "T\xc3\xbc" "hik" },
     };
 
-    static const struct KeysNameReplacement aImplReplacements_Lithuanian[] =
+    const struct KeysNameReplacement aImplReplacements_Lithuanian[] =
     {
         { PAPUGA_KEY_ESC, "Gr" },
         { PAPUGA_KEY_BACK, "Naikinti" },
@@ -140,7 +140,7 @@ namespace vcl_sal {
         { PAPUGA_KEY_ALT, "Alt" },
     };
 
-    static const struct KeysNameReplacement aImplReplacements_Slovenian[] =
+    const struct KeysNameReplacement aImplReplacements_Slovenian[] =
     {
         { PAPUGA_KEY_ESC, "Ube\xc5\xbe" "nica" },
         { PAPUGA_KEY_BACK, "Vra\xc4\x8d" "alka" },
@@ -161,7 +161,7 @@ namespace vcl_sal {
         { PAPUGA_KEY_ALT, "Izmenjalka" },
     };
 
-    static const struct KeysNameReplacement aImplReplacements_Spanish[] =
+    const struct KeysNameReplacement aImplReplacements_Spanish[] =
     {
         { PAPUGA_KEY_BACK, "Retroceso" },
         { PAPUGA_KEY_ENTER, "Intro" },
@@ -179,7 +179,7 @@ namespace vcl_sal {
         { PAPUGA_KEY_SHIFT, "May\xc3\xba" "s" },
     };
 
-    static const struct KeysNameReplacement aImplReplacements_Hungarian[] =
+    const struct KeysNameReplacement aImplReplacements_Hungarian[] =
     {
         { PAPUGA_KEY_RIGHT, "Jobbra" },
         { PAPUGA_KEY_LEFT, "Balra" },
@@ -189,7 +189,7 @@ namespace vcl_sal {
         { PAPUGA_KEY_SPACEBAR, "Sz\xc3\xb3" "k\xc3\xb6" "z" },
     };
 
-    static const struct KeyboardReplacements aKeyboards[] =
+    const struct KeyboardReplacements aKeyboards[] =
     {
         { "ast",aImplReplacements_Asturian, SAL_N_ELEMENTS(aImplReplacements_Asturian) },
         { "ca", aImplReplacements_Catalan, SAL_N_ELEMENTS(aImplReplacements_Catalan) },
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index dc7f50f4a0f7..287863129a9f 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -525,7 +525,7 @@ HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild )
 // translation table from System keycodes into StartView keycodes
 #define KEY_TAB_SIZE     146
 
-static const sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] =
+const sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] =
 {
     // StarView-Code      System-Code                         Index
     0,                    //                                  0