diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 13:17:47 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-07-02 17:24:09 +0200 |
| commit | 441af1f1ca53ca03736e0417414bbcf067aaaefa (patch) | |
| tree | 33eb111d8ae28feb9290882298438fcc08bdcb05 /vcl/source/window | |
| parent | f0d4f96a0c7c84ea6f81e14f9df1ca37be54db04 (diff) | |
Upcoming improved loplugin:staticanonymous -> redundantstatic: vcl
Change-Id: I7559ab5c98a22e315549b5dfc651e937697cac22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97742
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/EnumContext.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/window/NotebookBarAddonsMerger.cxx | 22 | ||||
| -rw-r--r-- | vcl/source/window/decoview.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/keycod.cxx | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/vcl/source/window/EnumContext.cxx b/vcl/source/window/EnumContext.cxx index 3229301e3f2b..b7d001c1b50b 100644 --- a/vcl/source/window/EnumContext.cxx +++ b/vcl/source/window/EnumContext.cxx @@ -29,13 +29,13 @@ namespace { typedef ::std::map<OUString,EnumContext::Application> ApplicationMap; -static ApplicationMap maApplicationMap; -static o3tl::enumarray<EnumContext::Application, OUString> maApplicationVector; +ApplicationMap maApplicationMap; +o3tl::enumarray<EnumContext::Application, OUString> maApplicationVector; typedef ::std::map<OUString,EnumContext::Context> ContextMap; -static ContextMap maContextMap; -static o3tl::enumarray<EnumContext::Context, OUString> maContextVector; +ContextMap maContextMap; +o3tl::enumarray<EnumContext::Context, OUString> maContextVector; } diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx index 9d6bf3dd98ea..1c042017a3fc 100644 --- a/vcl/source/window/NotebookBarAddonsMerger.cxx +++ b/vcl/source/window/NotebookBarAddonsMerger.cxx @@ -28,17 +28,17 @@ #include <vcl/IPrioritable.hxx> #include <OptionalBox.hxx> -static const char STYLE_TEXT[] = "Text"; -static const char STYLE_ICON[] = "Icon"; - -static const char MERGE_NOTEBOOKBAR_URL[] = "URL"; -static const char MERGE_NOTEBOOKBAR_TITLE[] = "Title"; -static const char MERGE_NOTEBOOKBAR_IMAGEID[] = "ImageIdentifier"; -static const char MERGE_NOTEBOOKBAR_CONTEXT[] = "Context"; -static const char MERGE_NOTEBOOKBAR_TARGET[] = "Target"; -static const char MERGE_NOTEBOOKBAR_CONTROLTYPE[] = "ControlType"; -static const char MERGE_NOTEBOOKBAR_WIDTH[] = "Width"; -static const char MERGE_NOTEBOOKBAR_STYLE[] = "Style"; +const char STYLE_TEXT[] = "Text"; +const char STYLE_ICON[] = "Icon"; + +const char MERGE_NOTEBOOKBAR_URL[] = "URL"; +const char MERGE_NOTEBOOKBAR_TITLE[] = "Title"; +const char MERGE_NOTEBOOKBAR_IMAGEID[] = "ImageIdentifier"; +const char MERGE_NOTEBOOKBAR_CONTEXT[] = "Context"; +const char MERGE_NOTEBOOKBAR_TARGET[] = "Target"; +const char MERGE_NOTEBOOKBAR_CONTROLTYPE[] = "ControlType"; +const char MERGE_NOTEBOOKBAR_WIDTH[] = "Width"; +const char MERGE_NOTEBOOKBAR_STYLE[] = "Style"; static void GetAddonNotebookBarItem(const css::uno::Sequence<css::beans::PropertyValue>& pExtension, AddonNotebookBarItem& aAddonNotebookBarItem) diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index fab8f183ca9d..b99335dd4804 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -23,7 +23,7 @@ #include <vcl/window.hxx> #include <vcl/ctrl.hxx> -static constexpr auto BUTTON_DRAW_FLATTEST = DrawButtonFlags::Flat | +constexpr auto BUTTON_DRAW_FLATTEST = DrawButtonFlags::Flat | DrawButtonFlags::Pressed | DrawButtonFlags::Checked | DrawButtonFlags::Highlight; diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 451e859f6aa6..0c8939ae0979 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -26,7 +26,7 @@ #include <vcl/window.hxx> #include <vcl/keycod.hxx> -static const sal_uInt16 aImplKeyFuncTab[(static_cast<int>(KeyFuncType::FRONT)+1)*4] = +const sal_uInt16 aImplKeyFuncTab[(static_cast<int>(KeyFuncType::FRONT)+1)*4] = { 0, 0, 0, 0, // KeyFuncType::DONTKNOW KEY_N | KEY_MOD1, 0, 0, 0, // KeyFuncType::NEW |