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>

3 files changed, 52 insertions, 52 deletions

diff --git a/fpicker/source/win32/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
index a116a69092c2..4275adf3b749 100644
--- a/fpicker/source/win32/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
@@ -233,8 +233,8 @@ void VistaFilePickerEventHandler::stopListening()
     }
 }
 
-static const char PROP_CONTROL_ID[] = "control_id";
-static const char PROP_PICKER_LISTENER[] = "picker_listener";
+const char PROP_CONTROL_ID[] = "control_id";
+const char PROP_PICKER_LISTENER[] = "picker_listener";
 
 namespace {
 
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx
index 3b8443a40c65..6c0c6b53856f 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -78,19 +78,19 @@ namespace vista{
 // types, const etcpp.
 
 
-static const ::sal_Int16 INVALID_CONTROL_ID     = -1;
-static const ::sal_Int16 INVALID_CONTROL_ACTION = -1;
+const ::sal_Int16 INVALID_CONTROL_ID     = -1;
+const ::sal_Int16 INVALID_CONTROL_ACTION = -1;
 
 // Guids used for IFileDialog::SetClientGuid
-static const GUID CLIENTID_FILEDIALOG_SIMPLE        = {0xB8628FD3, 0xA3F5, 0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83};
-static const GUID CLIENTID_FILEDIALOG_OPTIONS       = {0x93ED486F, 0x0D04, 0x4807, 0x8C, 0x44, 0xAC, 0x26, 0xCB, 0x6C, 0x5D, 0x36};
-static const GUID CLIENTID_FILESAVE_PASSWORD        = {0xC12D4F4C, 0x4D41, 0x4D4F, 0x97, 0xEF, 0x87, 0xF9, 0x8D, 0xB6, 0x1E, 0xA6};
-static const GUID CLIENTID_FILESAVE_SELECTION       = {0x5B2482B3, 0x0358, 0x4E09, 0xAA, 0x64, 0x2B, 0x76, 0xB2, 0xA0, 0xDD, 0xFE};
-static const GUID CLIENTID_FILESAVE_TEMPLATE        = {0x9996D877, 0x20D5, 0x424B, 0x9C, 0x2E, 0xD3, 0xB6, 0x31, 0xEC, 0xF7, 0xCE};
-static const GUID CLIENTID_FILEOPEN_LINK_TEMPLATE   = {0x32237796, 0x1509, 0x49D1, 0xBB, 0x7E, 0x63, 0xAD, 0x36, 0xAE, 0x86, 0x8C};
-static const GUID CLIENTID_FILEOPEN_LINK_ANCHOR     = {0xBE3188CB, 0x399A, 0x45AE, 0x8F, 0x78, 0x75, 0x17, 0xAF, 0x26, 0x81, 0xEA};
-static const GUID CLIENTID_FILEOPEN_PLAY            = {0x32CFB147, 0xF5AE, 0x4F90, 0xA1, 0xF1, 0x81, 0x20, 0x72, 0xBB, 0x2F, 0xC5};
-static const GUID CLIENTID_FILEOPEN_LINK            = {0x39AC4BAE, 0x7D2D, 0x46BC, 0xBE, 0x2E, 0xF8, 0x8C, 0xB5, 0x65, 0x5E, 0x6A};
+const GUID CLIENTID_FILEDIALOG_SIMPLE        = {0xB8628FD3, 0xA3F5, 0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83};
+const GUID CLIENTID_FILEDIALOG_OPTIONS       = {0x93ED486F, 0x0D04, 0x4807, 0x8C, 0x44, 0xAC, 0x26, 0xCB, 0x6C, 0x5D, 0x36};
+const GUID CLIENTID_FILESAVE_PASSWORD        = {0xC12D4F4C, 0x4D41, 0x4D4F, 0x97, 0xEF, 0x87, 0xF9, 0x8D, 0xB6, 0x1E, 0xA6};
+const GUID CLIENTID_FILESAVE_SELECTION       = {0x5B2482B3, 0x0358, 0x4E09, 0xAA, 0x64, 0x2B, 0x76, 0xB2, 0xA0, 0xDD, 0xFE};
+const GUID CLIENTID_FILESAVE_TEMPLATE        = {0x9996D877, 0x20D5, 0x424B, 0x9C, 0x2E, 0xD3, 0xB6, 0x31, 0xEC, 0xF7, 0xCE};
+const GUID CLIENTID_FILEOPEN_LINK_TEMPLATE   = {0x32237796, 0x1509, 0x49D1, 0xBB, 0x7E, 0x63, 0xAD, 0x36, 0xAE, 0x86, 0x8C};
+const GUID CLIENTID_FILEOPEN_LINK_ANCHOR     = {0xBE3188CB, 0x399A, 0x45AE, 0x8F, 0x78, 0x75, 0x17, 0xAF, 0x26, 0x81, 0xEA};
+const GUID CLIENTID_FILEOPEN_PLAY            = {0x32CFB147, 0xF5AE, 0x4F90, 0xA1, 0xF1, 0x81, 0x20, 0x72, 0xBB, 0x2F, 0xC5};
+const GUID CLIENTID_FILEOPEN_LINK            = {0x39AC4BAE, 0x7D2D, 0x46BC, 0xBE, 0x2E, 0xF8, 0x8C, 0xB5, 0x65, 0x5E, 0x6A};
 
 
 static OUString lcl_getURLFromShellItem (IShellItem* pItem)
@@ -533,11 +533,11 @@ void VistaFilePickerImpl::impl_sta_CreateFolderPicker(const RequestRef& rRequest
 }
 
 
-static const ::sal_Int32 GROUP_VERSION         =   1;
-static const ::sal_Int32 GROUP_TEMPLATE        =   2;
-static const ::sal_Int32 GROUP_IMAGETEMPLATE   =   3;
-static const ::sal_Int32 GROUP_CHECKBOXES      =   4;
-static const ::sal_Int32 GROUP_IMAGEANCHOR     =   5;
+const ::sal_Int32 GROUP_VERSION         =   1;
+const ::sal_Int32 GROUP_TEMPLATE        =   2;
+const ::sal_Int32 GROUP_IMAGETEMPLATE   =   3;
+const ::sal_Int32 GROUP_CHECKBOXES      =   4;
+const ::sal_Int32 GROUP_IMAGEANCHOR     =   5;
 
 
 static void setLabelToControl(TFileDialogCustomize iCustom, sal_uInt16 nControlId)
diff --git a/fpicker/source/win32/VistaFilePickerImpl.hxx b/fpicker/source/win32/VistaFilePickerImpl.hxx
index 0fee8587c89e..d60e3acbe020 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.hxx
@@ -47,40 +47,40 @@ namespace vista{
 // types, const etcpp
 
 
-static const ::sal_Int32 FEATURE_AUTOEXTENSION  =    1;
-static const ::sal_Int32 FEATURE_PASSWORD       =    2;
-static const ::sal_Int32 FEATURE_FILTEROPTIONS  =    4;
-static const ::sal_Int32 FEATURE_SELECTION      =    8;
-static const ::sal_Int32 FEATURE_TEMPLATE       =   16;
-static const ::sal_Int32 FEATURE_LINK           =   32;
-static const ::sal_Int32 FEATURE_PREVIEW        =   64;
-static const ::sal_Int32 FEATURE_IMAGETEMPLATE  =  128;
-static const ::sal_Int32 FEATURE_PLAY           =  256;
-static const ::sal_Int32 FEATURE_READONLY       =  512;
-static const ::sal_Int32 FEATURE_VERSION        = 1024;
-static const ::sal_Int32 FEATURE_GPGPASSWORD    = 2048;
-static const ::sal_Int32 FEATURE_IMAGEANCHOR    = 4096;
-
-static const OUString PROP_PICKER_LISTENER("picker_listener"   ); // [XFilePickerListenert]
-static const OUString PROP_DIALOG_SHOW_RESULT("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL
-static const OUString PROP_SELECTED_FILES("selected_files"     ); // [seq< OUString >] contains all user selected files (can be empty!)
-static const OUString PROP_MULTISELECTION_MODE("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
-static const OUString PROP_TITLE("title"              ); // [OUString]
-static const OUString PROP_FILENAME("filename"          ); // [OUString]
-static const OUString PROP_DIRECTORY("directory"          ); // [OUString]
-static const OUString PROP_FEATURES("features"           ); // [sal_Int32]
-static const OUString PROP_TEMPLATE_DESCR("templatedescription"); // [sal_Int32]
-static const OUString PROP_FILTER_TITLE("filter_title"       ); // [OUString]
-static const OUString PROP_FILTER_VALUE("filter_value"       ); // [OUString]
-static const OUString PROP_FILTER_GROUP("filter-group"       ); // [seq< css:beans::StringPair >] contains a group of filters
-
-static const OUString PROP_CONTROL_ID("control_id"         ); // [sal_Int16]
-static const OUString PROP_CONTROL_ACTION("control_action"     ); // [sal_Int16]
-static const OUString PROP_CONTROL_VALUE("control_value"      ); // [Any]
-static const OUString PROP_CONTROL_LABEL("control_label"      ); // [OUString]
-static const OUString PROP_CONTROL_ENABLE("control_enable"     ); // [sal_Bool] true=ON, false=OFF
-static const OUString PROP_PARENT_WINDOW("ParentWindow"); //[css::awt::XWindow] preferred parent window
-static const OUString STRING_SEPARATOR("------------------------------------------" );
+const ::sal_Int32 FEATURE_AUTOEXTENSION  =    1;
+const ::sal_Int32 FEATURE_PASSWORD       =    2;
+const ::sal_Int32 FEATURE_FILTEROPTIONS  =    4;
+const ::sal_Int32 FEATURE_SELECTION      =    8;
+const ::sal_Int32 FEATURE_TEMPLATE       =   16;
+const ::sal_Int32 FEATURE_LINK           =   32;
+const ::sal_Int32 FEATURE_PREVIEW        =   64;
+const ::sal_Int32 FEATURE_IMAGETEMPLATE  =  128;
+const ::sal_Int32 FEATURE_PLAY           =  256;
+const ::sal_Int32 FEATURE_READONLY       =  512;
+const ::sal_Int32 FEATURE_VERSION        = 1024;
+const ::sal_Int32 FEATURE_GPGPASSWORD    = 2048;
+const ::sal_Int32 FEATURE_IMAGEANCHOR    = 4096;
+
+const OUString PROP_PICKER_LISTENER("picker_listener"   ); // [XFilePickerListenert]
+const OUString PROP_DIALOG_SHOW_RESULT("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL
+const OUString PROP_SELECTED_FILES("selected_files"     ); // [seq< OUString >] contains all user selected files (can be empty!)
+const OUString PROP_MULTISELECTION_MODE("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
+const OUString PROP_TITLE("title"              ); // [OUString]
+const OUString PROP_FILENAME("filename"          ); // [OUString]
+const OUString PROP_DIRECTORY("directory"          ); // [OUString]
+const OUString PROP_FEATURES("features"           ); // [sal_Int32]
+const OUString PROP_TEMPLATE_DESCR("templatedescription"); // [sal_Int32]
+const OUString PROP_FILTER_TITLE("filter_title"       ); // [OUString]
+const OUString PROP_FILTER_VALUE("filter_value"       ); // [OUString]
+const OUString PROP_FILTER_GROUP("filter-group"       ); // [seq< css:beans::StringPair >] contains a group of filters
+
+const OUString PROP_CONTROL_ID("control_id"         ); // [sal_Int16]
+const OUString PROP_CONTROL_ACTION("control_action"     ); // [sal_Int16]
+const OUString PROP_CONTROL_VALUE("control_value"      ); // [Any]
+const OUString PROP_CONTROL_LABEL("control_label"      ); // [OUString]
+const OUString PROP_CONTROL_ENABLE("control_enable"     ); // [sal_Bool] true=ON, false=OFF
+const OUString PROP_PARENT_WINDOW("ParentWindow"); //[css::awt::XWindow] preferred parent window
+const OUString STRING_SEPARATOR("------------------------------------------" );
 
 
 /** native implementation of the file picker on Vista and upcoming windows versions.