INTEGRATION: CWS jl101 (1.29.12); FILE MERGED

2008/05/28 14:55:52 jl 1.29.12.1: #i89584# patch - remove unused code.

2 files changed, 3 insertions, 38 deletions

diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index cf5cc490a92b..9f3d67cfabda 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: framework.cxx,v $
- * $Revision: 1.29 $
+ * $Revision: 1.30 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1154,10 +1154,6 @@ void CJavaInfo::attach(::JavaInfo * info)
     pInfo = NULL;
     return tmp;
 }
-CJavaInfo::CJavaInfo(const ::JavaInfo* info): pInfo(0)
-{
-    pInfo = copyJavaInfo(info);
-}
 
 CJavaInfo::~CJavaInfo()
 {
@@ -1243,14 +1239,6 @@ rtl::OUString CJavaInfo::getLocation() const
         return rtl::OUString();
 }
 
-rtl::OUString CJavaInfo::getVersion() const
-{
-    if (pInfo)
-        return rtl::OUString(pInfo->sVersion);
-    else
-        return rtl::OUString();
-}
-
 sal_uInt64 CJavaInfo::getFeatures() const
 {
     if (pInfo)
@@ -1259,19 +1247,4 @@ sal_uInt64 CJavaInfo::getFeatures() const
         return 0l;
 }
 
-sal_uInt64 CJavaInfo::getRequirements() const
-{
-    if (pInfo)
-        return pInfo->nRequirements;
-    else
-        return 0l;
-}
-
-rtl::ByteSequence CJavaInfo::getVendorData() const
-{
-    if (pInfo)
-        return rtl::ByteSequence(pInfo->arVendorData);
-    else
-        return rtl::ByteSequence();
-}
 }
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 248673ff2750..f50a2a91afb5 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fwkutil.cxx,v $
- * $Revision: 1.29 $
+ * $Revision: 1.30 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -203,21 +203,13 @@ rtl::OUString getDirFromFile(const rtl::OUString& usFilePath)
     return rtl::OUString(usFilePath.getStr(), index);
 }
 
-rtl::OUString getFileFromURL(const rtl::OUString& sFileURL)
-{
-    sal_Int32 index= sFileURL.lastIndexOf('/');
-    if (index == -1)
-        return sFileURL;
-    return sFileURL.copy(index + 1);
-}
-
 rtl::OUString getExecutableDirectory()
 {
     rtl_uString* sExe = NULL;
     if (osl_getExecutableFile( & sExe) != osl_Process_E_None)
         throw FrameworkException(
             JFW_E_ERROR,
-            "[Java framework] Error in function getApplicationBase (fwkutil.cxx)");
+            "[Java framework] Error in function getExecutableDirectory (fwkutil.cxx)");
 
     rtl::OUString ouExe(sExe, SAL_NO_ACQUIRE);
     return getDirFromFile(ouExe);