[Libreoffice-commits] .: jvmfwk/plugins unusedcode.easy

[Jesús Corrius]

 jvmfwk/plugins/sunmajor/pluginlib/util.hxx       |    8 ++++----
 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx |   16 ----------------
 unusedcode.easy                                  |    1 -
 3 files changed, 4 insertions(+), 21 deletions(-)

New commits:
commit acbbd79b031889cc138a093813f3b8c2ceb9a3f5
Author: Marc Garcia <garcia.marc at gmail.com>
Date:   Fri May 4 08:28:20 2012 +0200

    Remove unused method VendorBase::getJavaExePaths(int*)

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index 891ad63..31671eb 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<rtl::OUString> 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<rtl::Reference<VendorBase> > & 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> VendorBase::createInstance()
 {
     VendorBase *pBase = new VendorBase();
diff --git a/unusedcode.easy b/unusedcode.easy
index bd03a58..0f931ac 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -682,7 +682,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<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
 nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)