diff options
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/elements.cxx | 37 | ||||
| -rw-r--r-- | jvmfwk/source/framework.cxx | 15 | ||||
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 2 |
3 files changed, 6 insertions, 48 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 70c38e852eaf..b25c49f07104 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -171,43 +171,6 @@ void createSettingsStructure(xmlDoc * document, bool * bNeedsSave) xmlAddChild(root, nodeCrLf); } - -VersionInfo::VersionInfo(): arVersions(nullptr) -{ -} - -VersionInfo::~VersionInfo() -{ -} - -void VersionInfo::addExcludeVersion(const OUString& sVersion) -{ - vecExcludeVersions.push_back(sVersion); -} - -rtl_uString** VersionInfo::getExcludeVersions() -{ - osl::MutexGuard guard(FwkMutex::get()); - if (arVersions != nullptr) - return arVersions; - - arVersions = new rtl_uString*[vecExcludeVersions.size()]; - int j=0; - typedef std::vector<OUString>::const_iterator it; - for (it i = vecExcludeVersions.begin(); i != vecExcludeVersions.end(); - ++i, ++j) - { - arVersions[j] = vecExcludeVersions[j].pData; - } - return arVersions; -} - -sal_Int32 VersionInfo::getExcludeVersionSize() -{ - return vecExcludeVersions.size(); -} - - NodeJava::NodeJava(Layer layer): m_layer(layer) { diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 5ae4c8773f71..99b3e5e329dd 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -93,8 +93,7 @@ javaFrameworkError jfw_findAllJREs(std::vector<std::unique_ptr<JavaInfo>> *pparI vendor, versionInfo.sMinVersion, versionInfo.sMaxVersion, - versionInfo.getExcludeVersions(), - versionInfo.getExcludeVersionSize(), + versionInfo.vecExcludeVersions, & arInfos, & cInfos, infos); @@ -121,8 +120,7 @@ javaFrameworkError jfw_findAllJREs(std::vector<std::unique_ptr<JavaInfo>> *pparI vendor, versionInfo.sMinVersion, versionInfo.sMaxVersion, - versionInfo.getExcludeVersions(), - versionInfo.getExcludeVersionSize(), + versionInfo.vecExcludeVersions, & aInfo.pInfo); if (plerr == javaPluginError::NoJre) continue; @@ -480,8 +478,7 @@ javaFrameworkError jfw_findAndSelectJRE(std::unique_ptr<JavaInfo> *pInfo) vendor, versionInfo.sMinVersion, versionInfo.sMaxVersion, - versionInfo.getExcludeVersions(), - versionInfo.getExcludeVersionSize(), + versionInfo.vecExcludeVersions, & arInfos, & cInfos, infos); @@ -551,8 +548,7 @@ javaFrameworkError jfw_findAndSelectJRE(std::unique_ptr<JavaInfo> *pInfo) vendor, versionInfo.sMinVersion, versionInfo.sMaxVersion, - versionInfo.getExcludeVersions(), - versionInfo.getExcludeVersionSize(), + versionInfo.vecExcludeVersions, & aInfo.pInfo); if (err == javaPluginError::NoJre) continue; @@ -717,8 +713,7 @@ javaFrameworkError jfw_getJavaInfoByPath(OUString const & pPath, std::unique_ptr vendor, versionInfo.sMinVersion, versionInfo.sMaxVersion, - versionInfo.getExcludeVersions(), - versionInfo.getExcludeVersionSize(), + versionInfo.vecExcludeVersions, & pInfo); if (plerr == javaPluginError::NONE) diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index df2e41e4994f..27950eb11630 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -191,7 +191,7 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) OString osVersion(sVersion); OUString usVersion = OStringToOUString( osVersion, RTL_TEXTENCODING_UTF8); - aVersionInfo.addExcludeVersion(usVersion); + aVersionInfo.vecExcludeVersions.push_back(usVersion); } } cur = cur->next; |