diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 07:37:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 07:37:17 +0000 |
| commit | efb2451866e771b0fa0ff5cc0ad75c2dbf8c234f (patch) | |
| tree | ecea482545837b862b883eac2585d75d5a5964d3 /jvmfwk | |
| parent | 26442db253e2b2f4e76036e2818e4faaab48fa03 (diff) | |
INTEGRATION: CWS jl101 (1.21.12); FILE MERGED
2008/05/28 15:03:29 jl 1.21.12.2: RESYNC: (1.21-1.22); FILE MERGED
2008/05/28 14:55:52 jl 1.21.12.1: #i89584# patch - remove unused code.
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/elements.cxx | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 0677398018da..880a4bd814a1 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: elements.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.23 $ * * This file is part of OpenOffice.org. * @@ -54,24 +54,6 @@ using namespace osl; namespace jfw { -xmlNode* findChildNode(const xmlNode * pParent, const xmlChar* pName) -{ - xmlNode* ret = NULL; - - if (pParent) - { - xmlNode* cur = pParent->children; - while (cur != NULL) - { - if (xmlStrcmp(cur->name, pName) == 0) - break; - cur = cur->next; - } - ret = cur; - } - return ret; -} - rtl::OString getElementUpdated() { //Prepare the xml document and context @@ -874,20 +856,6 @@ CNodeJavaInfo::~CNodeJavaInfo() { } -CNodeJavaInfo::CNodeJavaInfo(const JavaInfo * pInfo) -{ - if (pInfo != NULL) - { - m_bEmptyNode = false; -// sAttrVendorUpdate = sUpdated; - sVendor = pInfo->sVendor; - sLocation = pInfo->sLocation; - sVersion = pInfo->sVersion; - nFeatures = pInfo->nFeatures; - nRequirements = pInfo->nRequirements; - arVendorData = pInfo->arVendorData; - } -} void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo) { rtl::OString sExcMsg("[Java framework] Error in function NodeJavaInfo::loadFromNode " @@ -1206,11 +1174,6 @@ const rtl::OUString& MergedSettings::getUserClassPath() const return m_sClassPath; } -const std::vector<rtl::OUString>& MergedSettings::getVmParameters() const -{ - return m_vmParams; -} - ::std::vector< ::rtl::OString> MergedSettings::getVmParametersUtf8() const { ::std::vector< ::rtl::OString> ret; @@ -1232,12 +1195,12 @@ JavaInfo * MergedSettings::createJavaInfo() const { return m_javaInfo.makeJavaInfo(); } - +#ifdef WNT bool MergedSettings::getJavaInfoAttrAutoSelect() const { return m_javaInfo.bAutoSelect; } - +#endif void MergedSettings::getVmParametersArray( rtl_uString *** parParams, sal_Int32 * size) const { |