[Libreoffice-commits] core.git: jvmfwk/source
Stephan Bergmann
sbergman at redhat.com
Mon Dec 15 04:19:33 PST 2014
jvmfwk/source/framework.cxx | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 8814eb4770403dc2c210feb3a3dd2b5078c27c59
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Dec 15 13:18:56 2014 +0100
Remove unused cModule leftovers
Change-Id: Id08194460e9a42896591047e36b3a95e5fbc47be
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 05dd3fd..d43423d 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -76,9 +76,8 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
settings.getJRELocations();
//Use every plug-in library to get Java installations.
typedef std::vector<OUString>::const_iterator ci_pl;
- int cModule = 0;
- for (ci_pl i = vecVendors.begin(); i != vecVendors.end(); ++i, ++cModule)
- {
+ for (ci_pl i = vecVendors.begin(); i != vecVendors.end(); ++i)
+ {
const OUString & vendor = *i;
jfw::VersionInfo versionInfo =
aVendorSettings.getVersionInformation(vendor);
@@ -393,8 +392,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
//Use every vendor to get Java installations. At the first usable
//Java the loop will break
typedef std::vector<OUString>::const_iterator ci_pl;
- int cModule = 0;
- for (ci_pl i = vecVendors.begin(); i != vecVendors.end(); ++i, ++cModule)
+ for (ci_pl i = vecVendors.begin(); i != vecVendors.end(); ++i)
{
const OUString & vendor = *i;
jfw::VersionInfo versionInfo =
@@ -660,9 +658,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
//Use every plug-in library to determine if the path represents a
//JRE. If a plugin recognized it then the loop will break
typedef std::vector<OUString>::const_iterator ci_pl;
- int cModule = 0;
- for (ci_pl i = vecVendors.begin(); i != vecVendors.end();
- ++i, ++cModule)
+ for (ci_pl i = vecVendors.begin(); i != vecVendors.end(); ++i)
{
const OUString & vendor = *i;
jfw::VersionInfo versionInfo =
More information about the Libreoffice-commits
mailing list