summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-04 09:27:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-04 10:44:36 +0000
commitf4d03933dc764139dc1e40fe6985a3cac090216e (patch)
tree22ead95a258f6af1a8a48ad785cf6a196c9a8c54 /jvmfwk
parentbfa01d8a8248f7e44675de5ed1f85a1d17105022 (diff)
callcatcher: update unused code
Change-Id: Ia25b857738bb7b6c3baf18c68ef0d1bc0b3e142e
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/source/elements.cxx28
-rw-r--r--jvmfwk/source/elements.hxx7
-rw-r--r--jvmfwk/source/framework.cxx10
-rw-r--r--jvmfwk/source/framework.hxx1
-rw-r--r--jvmfwk/source/fwkutil.cxx79
-rw-r--r--jvmfwk/source/fwkutil.hxx17
-rw-r--r--jvmfwk/source/libxmlutil.cxx5
-rw-r--r--jvmfwk/source/libxmlutil.hxx3
8 files changed, 0 insertions, 150 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index a1c5aa987701..b89ea9a7c74c 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -644,29 +644,6 @@ void NodeJava::setVmParameters(rtl_uString * * arOptions, sal_Int32 size)
}
}
-void NodeJava::setJRELocations(rtl_uString * * arLocations, sal_Int32 size)
-{
- OSL_ASSERT( !(arLocations == 0 && size != 0));
- if (! m_JRELocations)
- m_JRELocations = boost::optional<std::vector<OUString> > (
- std::vector<OUString>());
- m_JRELocations->clear();
- if (arLocations != NULL)
- {
- for (int i = 0; i < size; i++)
- {
- const OUString & sLocation = static_cast<rtl_uString*>(arLocations[i]);
-
- //only add the path if not already present
- std::vector<OUString>::const_iterator it =
- std::find(m_JRELocations->begin(), m_JRELocations->end(),
- sLocation);
- if (it == m_JRELocations->end())
- m_JRELocations->push_back(sLocation);
- }
- }
-}
-
void NodeJava::addJRELocation(rtl_uString * sLocation)
{
OSL_ASSERT( sLocation);
@@ -681,11 +658,6 @@ void NodeJava::addJRELocation(rtl_uString * sLocation)
m_JRELocations->push_back(OUString(sLocation));
}
-
-
-
-
-
jfw::FileStatus NodeJava::checkSettingsFileStatus(OUString const & sURL) const
{
jfw::FileStatus ret = FILE_DOES_NOT_EXIST;
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index d81874d426cd..f62e7b0d2cfc 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -207,13 +207,6 @@ public:
*/
void setVmParameters(rtl_uString * * arParameters, sal_Int32 size);
- /** sets the /java/jreLocations/location elements.
- When this method is called then all previous values are removed
- and replaced by those in arParamters.
- /java/jreLocations@xsi:nil will be set to true write() is called.
- */
- void setJRELocations(rtl_uString * * arParameters, sal_Int32 size);
-
/** adds a location to the already existing locations.
Note: call load() before, then add the location and then call write().
*/
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index d2092dcc8d30..05dd3fdd79c7 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -1067,16 +1067,6 @@ CJavaInfo & CJavaInfo::operator = (const ::JavaInfo* info)
return *this;
}
-
-
-OUString CJavaInfo::getVendor() const
-{
- if (pInfo)
- return OUString(pInfo->sVendor);
- else
- return OUString();
-}
-
OUString CJavaInfo::getLocation() const
{
if (pInfo)
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 0d0ba187936a..fcd687c2ff68 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -100,7 +100,6 @@ public:
operator ::JavaInfo const * () const { return pInfo;}
::JavaInfo* cloneJavaInfo() const;
- OUString getVendor() const;
OUString getLocation() const;
sal_uInt64 getFeatures() const;
};
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 4edb4e8a975d..b6a6eef63756 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -195,85 +195,6 @@ OUString getExecutableDirectory()
return getDirFromFile(ouExe);
}
-OUString findPlugin(
- const OUString & baseUrl, const OUString & plugin)
-{
- OUString expandedPlugin;
- try
- {
- expandedPlugin = cppu::bootstrap_expandUri(plugin);
- }
- catch (const com::sun::star::lang::IllegalArgumentException & e)
- {
- throw FrameworkException(
- JFW_E_ERROR,
- OString("[Java framework] IllegalArgumentException in findPlugin: ")
- + OUStringToOString(e.Message, osl_getThreadTextEncoding()));
- }
- OUString sUrl;
- try
- {
- sUrl = rtl::Uri::convertRelToAbs(baseUrl, expandedPlugin);
- }
- catch (const rtl::MalformedUriException & e)
- {
- throw FrameworkException(
- JFW_E_ERROR,
- OString("[Java framework] rtl::MalformedUriException in findPlugin: ")
- + OUStringToOString(
- e.getMessage(), osl_getThreadTextEncoding()));
- }
- if (checkFileURL(sUrl) == jfw::FILE_OK)
- {
- return sUrl;
- }
- OUString retVal;
- OUString sProgDir = getExecutableDirectory();
- sUrl = sProgDir + "/" + plugin;
- jfw::FileStatus s = checkFileURL(sUrl);
- if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST)
- {
- //If only the name of the library is given, then
- //use PATH, LD_LIBRARY_PATH etc. to locate the plugin
- if (plugin.indexOf('/') == -1)
- {
- OUString url;
-#ifdef UNX
-#if defined(MACOSX)
- OUString path = "DYLD_LIBRARY_PATH";
-#elif defined(AIX)
- OUString path = "LIBPATH";
-#else
- OUString path = "LD_LIBRARY_PATH";
-#endif
- OUString env_path;
- oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData);
- if (err != osl_Process_E_None && err != osl_Process_E_NotFound)
- throw FrameworkException(
- JFW_E_ERROR,
- "[Java framework] Error in function findPlugin (fwkutil.cxx).");
- if (err == osl_Process_E_NotFound)
- return retVal;
- if (osl_searchFileURL(plugin.pData, env_path.pData, &url.pData)
- == osl_File_E_None)
-#else
- if (osl_searchFileURL(plugin.pData, NULL, &url.pData)
- == osl_File_E_None)
-#endif
- retVal = url;
- else
- throw FrameworkException(
- JFW_E_ERROR,
- "[Java framework] Error in function findPlugin (fwkutil.cxx).");
- }
- }
- else
- {
- retVal = sUrl;
- }
- return retVal;
-}
-
OUString getLibraryLocation()
{
OString sExcMsg("[Java framework] Error in function getLibraryLocation "
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 71479d2605bc..af157d00ec06 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -79,23 +79,6 @@ OUString getDirFromFile(const OUString& usFilePath);
/** Returns the file URL of the folder where the executable resides.
*/
OUString getExecutableDirectory();
-/** Locates the plugin library and returns the file URL.
-
- First tries to locate plugin relative to baseUrl (if relative);
- vnd.sun.star.expand URLs are supported. If that fails, tries to
- locate plugin relative to the executable. If that fails, and plugin
- contains no slashes, tries to locate plugin in a platform-specific way
- (e.g., LD_LIBRARY_PATH).
-
- @param baseUrl
- The base file URL relative to which the plugin argument is interpreted.
-
- @param plugin
- The argument is an absolute or relative URL or just the name of the plugin.
- */
-OUString findPlugin(
- const OUString & baseUrl, const OUString & plugin);
-
enum FileStatus
{
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index 838c73590102..8a69361ef0b7 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -22,11 +22,6 @@
namespace jfw
{
-CXPathObjectPtr::CXPathObjectPtr(xmlXPathObject* aObject)
- : _object(aObject)
-{
-}
-
CXPathObjectPtr::CXPathObjectPtr():_object(NULL)
{
}
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index 1679110e275f..9cf134641415 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -32,9 +32,6 @@ class CXPathObjectPtr
CXPathObjectPtr(const CXPathObjectPtr&);
public:
CXPathObjectPtr();
- /** Takes ownership of xmlXPathObject
- */
- CXPathObjectPtr(xmlXPathObject* aObject);
~CXPathObjectPtr();
/** Takes ownership of xmlXPathObject
*/