diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-24 15:41:53 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-24 17:22:05 +0200 |
| commit | 928b1b04adc1cd49cc5d00069084e03675a320f3 (patch) | |
| tree | 8710687a4a66a628bd12c5482d7d93cc27f8996a /jvmfwk/plugins | |
| parent | ec709a8d5e808b970a8930a389c0a5a6f61fe8c7 (diff) | |
loplugin:external (clang-cl)
Including:
* expanding STDAPI to its definition (as per
<https://msdn.microsoft.com/library/ms686631(vs.85).aspx> "STDAPI"), to add
__declspec(dllexport) into its middle, in
extensions/source/activex/so_activex.cxx; as discussed in the comments at
<https://gerrit.libreoffice.org/#/c/60691/> "Get rid of Windows .def files in
setup_native, use __declspec(dllexport)", having a function both listed in a
.def file EXPORTS and marking it dllexport is OK, and the latter helps the
heuristics of loplugin:external; however, the relevant functions in
extensions/source/activex/so_activex.cxx probably don't even need to be
exported in the first place?
* follow-up loplugin:salcall in sal/osl/w32/file-impl.hxx
Change-Id: Ida6e17eba19cfa3d7e5c72dda57409005c0a0191
Reviewed-on: https://gerrit.libreoffice.org/60938
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 250a7655ffba..52a9b063c900 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -114,8 +114,8 @@ char const *g_arSearchPaths[] = { namespace jfw_plugin { #if defined(_WIN32) -bool getSDKInfoFromRegistry(vector<OUString> & vecHome); -bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome); +static bool getSDKInfoFromRegistry(vector<OUString> & vecHome); +static bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome); #endif static bool decodeOutput(const OString& s, OUString* out); @@ -568,7 +568,7 @@ bool decodeOutput(const OString& s, OUString* out) #if defined(_WIN32) -bool getJavaInfoFromRegistry(const wchar_t* szRegKey, +static bool getJavaInfoFromRegistry(const wchar_t* szRegKey, vector<OUString>& vecJavaHome) { HKEY hRoot; @@ -650,7 +650,7 @@ bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome) return getJavaInfoFromRegistry(HKEY_SUN_JRE, vecJavaHome); } -void addJavaInfoFromWinReg( +static void addJavaInfoFromWinReg( std::vector<rtl::Reference<VendorBase> > & allInfos, std::vector<rtl::Reference<VendorBase> > & addedInfos) { |