summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-08-04 15:42:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-08-04 20:20:41 +0200
commit924341e2c73e28b92fb927f2a4b5494ded5f257a (patch)
treeb3259d4d66ca2cdac17383475472b22c72b67624 /setup_native
parent56223a535d9c1da3ebf36dac9ee09e62b6de242a (diff)
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>
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/customactions/inst_msu/inst_msu.cxx2
-rw-r--r--setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx10
-rw-r--r--setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx2
3 files changed, 7 insertions, 7 deletions
diff --git a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
index 26f7668ff069..5dc47993a132 100644
--- a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
+++ b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
@@ -112,7 +112,7 @@ void WriteLogElem(MSIHANDLE hInst, MSIHANDLE hRec, std::ostringstream& sTmpl, UI
WriteLogElem(hInst, hRec, sTmpl, nField, elem.c_str(), others...);
}
-static std::string sLogPrefix;
+std::string sLogPrefix;
template <class... StrType> void WriteLog(MSIHANDLE hInst, const StrType&... elements)
{
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 1a2e82eb7c54..70ba1cc5246c 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -62,11 +62,11 @@ static const WCHAR* g_Extensions[] =
nullptr
};
-static const int WORD_START = 0;
-static const int EXCEL_START = 9;
-static const int POWERPOINT_START = 20;
-static const int VISIO_START = 30;
-static const int VISIO_END = 32;
+const int WORD_START = 0;
+const int EXCEL_START = 9;
+const int POWERPOINT_START = 20;
+const int VISIO_START = 30;
+const int VISIO_END = 32;
// ".xlam", // Office Excel 2007 XML macro-enabled add-in
// ".ppam", // Office PowerPoint 2007 macro-enabled XML add-in
diff --git a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
index c7b1cc742938..e7e7013f3471 100644
--- a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
+++ b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
@@ -111,7 +111,7 @@ void WriteLogElem(MSIHANDLE hInst, MSIHANDLE hRec, std::ostringstream& sTmpl, UI
WriteLogElem(hInst, hRec, sTmpl, nField, elem.c_str(), others...);
}
-static std::string sLogPrefix;
+std::string sLogPrefix;
template <class... StrType> void WriteLog(MSIHANDLE hInst, const StrType&... elements)
{