diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-15 15:00:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-15 16:45:51 +0100 |
commit | 5d2398a982ea756c99d5f9300b93d61b884eddc4 (patch) | |
tree | 68e89d07b00d86d86f4efffed77f8dbb8ab5dfcb /jvmfwk | |
parent | 40138cee6b6f19a7725f3ce9316f285b86366a06 (diff) |
getJREInfoFromBinPath return value is unused
Change-Id: I360d7cb7c03e78739883db4b989ba5f31bc8e24b
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 11 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.hxx | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 8924a5949301..567e0116cfe5 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -716,12 +716,11 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec) } -bool getJREInfoFromBinPath( +void getJREInfoFromBinPath( const OUString& path, vector<rtl::Reference<VendorBase> > & vecInfos) { // file:///c:/jre/bin //map: jre/bin/java.exe - bool ret = false; for ( sal_Int32 pos = 0; gVendorMap[pos].sVendorName != NULL; ++pos ) @@ -765,15 +764,11 @@ bool getJREInfoFromBinPath( } if (!sHome.isEmpty()) { - ret = getJREInfoByPath(sHome, vecInfos); - if (ret) - break; + if (getJREInfoByPath(sHome, vecInfos)) + return; } } - if (ret) - break; } - return ret; } vector<Reference<VendorBase> > getAllJREInfos() diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx index 38d3175dacc5..e8bfb119af70 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx @@ -35,7 +35,7 @@ std::vector<OUString> getVectorFromCharArray(char const * const * ar, int size); argument to getJREInfoByPath. For example usBinDir is file:///c:/j2sdk/jre/bin then file:///c:/j2sdk/jre would be derived. */ -bool getJREInfoFromBinPath( +void getJREInfoFromBinPath( const OUString& path, std::vector<rtl::Reference<VendorBase> > & vecInfos); inline OUString getDirFromFile(const OUString& usFilePath); void createJavaInfoFromPath(std::vector<rtl::Reference<VendorBase> >& vecInfos); |