diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-30 12:16:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-31 08:25:07 +0200 |
| commit | c9253818ec8252169c20450b41878be459568d95 (patch) | |
| tree | 1f271151725042f33c3c8aa3988343bcd7f89e12 /jvmfwk/plugins | |
| parent | 242a796a71e29a1d8cdc4dd71d2465b898db32ab (diff) | |
loplugin:oncevar
extend oncevar to any POD type
Change-Id: Ia98ee0a67f183e40fb0c38477760124b2c411dc0
Reviewed-on: https://gerrit.libreoffice.org/40564
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 6 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 3 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index dee43b6b6d67..4485828a8926 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -103,7 +103,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) OUString const sJavaHomeProperty("java.home"); OUString const sJavaLibraryPathProperty("java.library.path"); OUString const sGNUHomeProperty("gnu.classpath.home.url"); - OUString sAccessProperty("javax.accessibility.assistive_technologies"); + OUString const sAccessProperty("javax.accessibility.assistive_technologies"); bool bVersion = false; bool bVendor = false; @@ -261,8 +261,6 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) char const * const * arLDPaths = getLibraryPaths( & size); vector<OUString> ld_paths = getVectorFromCharArray(arLDPaths, size); - char arSep[]= {SAL_PATHSEPARATOR, 0}; - OUString sPathSep= OUString::createFromAscii(arSep); bool bLdPath = true; int c = 0; for(i_path il = ld_paths.begin(); il != ld_paths.end(); ++il, ++c) @@ -274,7 +272,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) { if(c > 0) - m_sLD_LIBRARY_PATH+= sPathSep; + m_sLD_LIBRARY_PATH+= OUStringLiteral1(SAL_PATHSEPARATOR); m_sLD_LIBRARY_PATH+= usSysPath; } else diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 40ce22e78ea9..457c613f7db6 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -135,8 +135,7 @@ OString getPluginJarPath( if (osl_getSystemPathFromFileURL(sName.pData, & sPath2.pData) == osl_File_E_None) { - char sep[] = {SAL_PATHSEPARATOR, 0}; - sPath = sPath1 + OUString::createFromAscii(sep) + sPath2; + sPath = sPath1 + OUStringLiteral1(SAL_PATHSEPARATOR) + sPath2; } } OSL_ASSERT(!sPath.isEmpty()); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index 1f7423045bc1..b3e5a4c43de2 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -153,8 +153,6 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props) char const * const * arLDPaths = getLibraryPaths( & size); vector<OUString> ld_paths = getVectorFromCharArray(arLDPaths, size); - char arSep[]= {SAL_PATHSEPARATOR, 0}; - OUString sPathSep= OUString::createFromAscii(arSep); bool bLdPath = true; int c = 0; for(i_path il = ld_paths.begin(); il != ld_paths.end(); ++il, ++c) @@ -166,7 +164,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props) { if(c > 0) - m_sLD_LIBRARY_PATH+= sPathSep; + m_sLD_LIBRARY_PATH+= OUStringLiteral1(SAL_PATHSEPARATOR); m_sLD_LIBRARY_PATH+= usSysPath; } else |