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

[Stephan Bergmann (via logerrit)]

 fpicker/source/office/OfficeControlAccess.cxx |   16 ++++++++--------
 fpicker/source/office/OfficeControlAccess.hxx |   10 +++++-----
 fpicker/source/office/fps_office.cxx          |    2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 7df1884118a0d995ec57679ef83e586c95063858
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jul 1 08:18:50 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 1 09:21:37 2020 +0200

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

diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 47796ec4e58e..b8bd0cfed4d7 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -67,7 +67,7 @@ namespace svt
         #define PROPERTY_FLAGS_CHECKBOX     ( PropFlags::Checked | PropFlags::Text )
 
         // Note: this array MUST be sorted by name!
-        static const ControlDescription aDescriptions[] =  {
+        const ControlDescription aDescriptions[] =  {
             { "AutoExtensionBox",       CHECKBOX_AUTOEXTENSION,         PROPERTY_FLAGS_COMMON | PROPERTY_FLAGS_CHECKBOX     },
             { "CancelButton",           PUSHBUTTON_CANCEL,              PROPERTY_FLAGS_COMMON | PropFlags::Text          },
             { "CurrentFolderText",      FIXEDTEXT_CURRENTFOLDER,        PROPERTY_FLAGS_COMMON | PropFlags::Text          },
@@ -99,10 +99,10 @@ namespace svt
             { "VersionListLabel",       LISTBOX_VERSION_LABEL,          PROPERTY_FLAGS_COMMON | PropFlags::Text          }
         };
 
-        static const sal_Int32 s_nControlCount = SAL_N_ELEMENTS( aDescriptions );
+        const sal_Int32 s_nControlCount = SAL_N_ELEMENTS( aDescriptions );
 
-        static ControlDescIterator s_pControls = aDescriptions;
-        static ControlDescIterator s_pControlsEnd = aDescriptions + s_nControlCount;
+        ControlDescIterator s_pControls = aDescriptions;
+        ControlDescIterator s_pControlsEnd = aDescriptions + s_nControlCount;
 
         struct ControlDescriptionLookup
         {
@@ -120,7 +120,7 @@ namespace svt
 
         typedef const ControlProperty* ControlPropertyIterator;
 
-        static const ControlProperty aProperties[] =  {
+        const ControlProperty aProperties[] =  {
             { "Text",               PropFlags::Text              },
             { "Enabled",            PropFlags::Enabled          },
             { "Visible",            PropFlags::Visible           },
@@ -131,10 +131,10 @@ namespace svt
             { "Checked",            PropFlags::Checked           }
         };
 
-        static const int s_nPropertyCount = SAL_N_ELEMENTS( aProperties );
+        const int s_nPropertyCount = SAL_N_ELEMENTS( aProperties );
 
-        static ControlPropertyIterator s_pProperties = aProperties;
-        static ControlPropertyIterator s_pPropertiesEnd = aProperties + s_nPropertyCount;
+        ControlPropertyIterator s_pProperties = aProperties;
+        ControlPropertyIterator s_pPropertiesEnd = aProperties + s_nPropertyCount;
 
 
         struct ControlPropertyLookup
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index 565afb9d2f4d..eabc3c3705c8 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -47,11 +47,11 @@ namespace svt
 
     namespace InternalFilePickerElementIds
     {
-        static const sal_Int16 PUSHBUTTON_HELP = sal_Int16(0x1000);
-        static const sal_Int16 TOOLBOXBUTOON_DEFAULT_LOCATION = sal_Int16(0x1001);
-        static const sal_Int16 TOOLBOXBUTOON_LEVEL_UP = sal_Int16(0x1002);
-        static const sal_Int16 TOOLBOXBUTOON_NEW_FOLDER = sal_Int16(0x1003);
-        static const sal_Int16 FIXEDTEXT_CURRENTFOLDER = sal_Int16(0x1004);
+        const sal_Int16 PUSHBUTTON_HELP = sal_Int16(0x1000);
+        const sal_Int16 TOOLBOXBUTOON_DEFAULT_LOCATION = sal_Int16(0x1001);
+        const sal_Int16 TOOLBOXBUTOON_LEVEL_UP = sal_Int16(0x1002);
+        const sal_Int16 TOOLBOXBUTOON_NEW_FOLDER = sal_Int16(0x1003);
+        const sal_Int16 FIXEDTEXT_CURRENTFOLDER = sal_Int16(0x1004);
     }
 
 
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index a08c1b1830d5..335bf41e8028 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -25,7 +25,7 @@
 #include "OfficeFilePicker.hxx"
 #include "OfficeFolderPicker.hxx"
 
-static const cppu::ImplementationEntry g_entries[] =
+const cppu::ImplementationEntry g_entries[] =
 {
     {
         SvtRemoteFilePicker::impl_createInstance,