diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-07 16:28:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-27 08:20:43 +0000 |
| commit | 644487a1152c7586a7f20c7f372572a71d8494d5 (patch) | |
| tree | 683cdbd755ec1660e75f930e5be4cd6867e3e734 /jvmfwk | |
| parent | 1b4dff2c371d31c99f34324c3f6f31888bdc34d7 (diff) | |
loplugin:unusedmethods
Change-Id: I161cd52606c11b6008f5d8b1d8ee391692f91861
Reviewed-on: https://gerrit.libreoffice.org/19231
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/elements.cxx | 21 | ||||
| -rw-r--r-- | jvmfwk/source/elements.hxx | 5 | ||||
| -rw-r--r-- | jvmfwk/source/framework.cxx | 26 |
3 files changed, 0 insertions, 52 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 02730683a0b4..8096841f6e18 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -1090,27 +1090,6 @@ void MergedSettings::getVmParametersArray( *size = m_vmParams.size(); } -void MergedSettings::getJRELocations( - rtl_uString *** parLocations, sal_Int32 * size) const -{ - osl::MutexGuard guard(FwkMutex::get()); - assert(parLocations != NULL && size != NULL); - - *parLocations = static_cast<rtl_uString **>( - rtl_allocateMemory(sizeof(rtl_uString*) * m_JRELocations.size())); - if (*parLocations == NULL) - return; - - int j=0; - typedef std::vector<OUString>::const_iterator it; - for (it i = m_JRELocations.begin(); i != m_JRELocations.end(); - ++i, ++j) - { - (*parLocations)[j] = i->pData; - rtl_uString_acquire(i->pData); - } - *size = m_JRELocations.size(); -} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index d1a741945fa6..7d457914ca29 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -314,11 +314,6 @@ public: */ void getVmParametersArray(rtl_uString *** parParameters, sal_Int32 * size) const; - /** returns an array. - Caller must free the strings and the array. - */ - void getJRELocations(rtl_uString *** parLocations, sal_Int32 * size) const; - const ::std::vector< OUString> & getJRELocations() const { return m_JRELocations;} }; diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 5d18738a6ddc..1bd033fe13e7 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -1005,32 +1005,6 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation) } -javaFrameworkError SAL_CALL jfw_getJRELocations( - rtl_uString *** parLocations, sal_Int32 *pLen) -{ - javaFrameworkError errcode = JFW_E_NONE; - try - { - osl::MutexGuard guard(jfw::FwkMutex::get()); - if (jfw::getMode() == jfw::JFW_MODE_DIRECT) - return JFW_E_DIRECT_MODE; - - if (parLocations == NULL || pLen == NULL) - return JFW_E_INVALID_ARG; - const jfw::MergedSettings settings; - settings.getJRELocations(parLocations, pLen); - } - catch (const jfw::FrameworkException& e) - { - errcode = e.errorCode; - fprintf(stderr, "%s\n", e.message.getStr()); - OSL_FAIL(e.message.getStr()); - } - - return errcode; -} - - javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist) { //get the function jfw_plugin_existJRE |