From ff1a74eeebaf0662d0224b0c40cee55789e1348b Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Thu, 3 May 2012 09:15:49 +0200 Subject: [PATCH] Remove unused method VendorBase::getJavaExePaths(int*) --- jvmfwk/plugins/sunmajor/pluginlib/util.hxx | 8 ++++---- jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 16 ---------------- unusedcode.easy | 1 - 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx index 891ad63..0d60717 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx @@ -39,10 +39,10 @@ namespace jfw_plugin class VendorBase; std::vector getVectorFromCharArray(char const * const * ar, int size); -/* The function uses the relative paths, such as "bin/java.exe" as provided by - VendorBase::getJavaExePaths and the provided path to derive the the home directory. - The home directory is then used as argument to getJREInfoByPath. For example - usBinDir is file:///c:/j2sdk/jre/bin then file:///c:/j2sdk/jre would be derived. +/* The function uses the relative paths, such as "bin/java.exe" and the provided + path to derive the the home directory. The home directory is then used as + argument to getJREInfoByPath. For example usBinDir is + file:///c:/j2sdk/jre/bin then file:///c:/j2sdk/jre would be derived. */ bool getJREInfoFromBinPath( const rtl::OUString& path, std::vector > & vecInfos); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index a63bfcf..60196bf 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -71,22 +71,6 @@ VendorBase::VendorBase(): m_bAccessibility(false) { } -char const* const * VendorBase::getJavaExePaths(int* size) -{ - static char const * ar[] = { -#if defined(WNT) - "java.exe", - "bin/java.exe" -#elif UNX - "java", - "bin/java" -#endif - }; - *size = sizeof(ar) / sizeof(char*); - return ar; -} - - rtl::Reference VendorBase::createInstance() { VendorBase *pBase = new VendorBase(); diff --git a/unusedcode.easy b/unusedcode.easy index 00cd6fa..de0a8ad 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -683,7 +683,6 @@ formula::EditBox::EditBox(Window*, long) formula::FormulaListBox::FormulaListBox(Window*, long) formula::FormulaTokenIterator::First() jfw_plugin::VendorBase::createInstance() -jfw_plugin::VendorBase::getJavaExePaths(int*) nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&) nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges::ConnectedComponents const&) nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges::ConnectedComponents const&) -- 1.7.1