diff options
| author | Noel Grandin <noel@peralex.com> | 2016-04-25 09:59:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-26 10:55:58 +0000 |
| commit | e8fd5a07eca70912ddee45aaa34d434809b59fb7 (patch) | |
| tree | d5dc890d12987cad73f5e64301f823ba23a97f2d /jvmfwk/plugins | |
| parent | tdf#98163 Flush ressources at CustomShapes during import (diff) | |
| download | core-e8fd5a07eca70912ddee45aaa34d434809b59fb7.tar.gz core-e8fd5a07eca70912ddee45aaa34d434809b59fb7.zip | |
update loplugin stylepolice to check local pointers vars
are actually pointer vars.
Also convert from regex to normal code, so we can enable this
plugin all the time.
Change-Id: Ie36a25ecba61c18f99c77c77646d6459a443cbd1
Reviewed-on: https://gerrit.libreoffice.org/24391
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 5f8be77189ba..718902caba6f 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -64,8 +64,8 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return -1; } - jfw::JavaInfoGuard pInfo; - errcode = jfw_getSelectedJRE(&pInfo.info); + jfw::JavaInfoGuard aInfo; + errcode = jfw_getSelectedJRE(&aInfo.info); if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS) { @@ -73,19 +73,19 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return -1; } - if (pInfo.info == nullptr) + if (aInfo.info == nullptr) { - if (!findAndSelect(&pInfo.info)) + if (!findAndSelect(&aInfo.info)) return -1; } else { //check if the JRE was not uninstalled sal_Bool bExist = false; - errcode = jfw_existJRE(pInfo.info, &bExist); + errcode = jfw_existJRE(aInfo.info, &bExist); if (errcode == JFW_E_NONE) { - if (!bExist && !findAndSelect(&pInfo.info)) + if (!bExist && !findAndSelect(&aInfo.info)) return -1; } else @@ -95,7 +95,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } } - OString sPaths = getLD_LIBRARY_PATH(pInfo.info->arVendorData); + OString sPaths = getLD_LIBRARY_PATH(aInfo.info->arVendorData); fprintf(stdout, "%s\n", sPaths.getStr()); } catch (const std::exception&) |