diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 07:37:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 07:37:30 +0000 |
| commit | 2a9958429bf6dbf37c267b2de7faadf0748550cf (patch) | |
| tree | bece3a521a8d8fb4a4963e432464438b7aa3e2c2 /jvmfwk | |
| parent | efb2451866e771b0fa0ff5cc0ad75c2dbf8c234f (diff) | |
INTEGRATION: CWS jl101 (1.11.12); FILE MERGED
2008/05/28 15:03:18 jl 1.11.12.2: RESYNC: (1.11-1.12); FILE MERGED
2008/05/28 14:55:52 jl 1.11.12.1: #i89584# patch - remove unused code.
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/elements.hxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index a606b09c64fa..a3d7bdae9c24 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: elements.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -44,8 +44,6 @@ namespace jfw { -xmlNode* findChildNode(const xmlNode * pParent, const xmlChar* pName); - /** gets the value of the updated element from the javavendors.xml. */ rtl::OString getElementUpdated(); @@ -69,11 +67,6 @@ class CNodeJavaInfo public: CNodeJavaInfo(); ~CNodeJavaInfo(); - /** - sUpdated is the value from the <updated> element from the - javavendors.xml. - */ - CNodeJavaInfo(const JavaInfo * pInfo); /** if true, then javaInfo is empty. When writeToNode is called then all child elements are deleted. @@ -322,8 +315,6 @@ public: const ::rtl::OUString & getUserClassPath() const; - const ::std::vector< ::rtl::OUString>& getVmParameters() const; - ::std::vector< ::rtl::OString> getVmParametersUtf8() const; /** returns a JavaInfo structure representing the node /java/javaInfo. Every time a new JavaInfo structure is created @@ -336,12 +327,14 @@ public: */ ::rtl::OString const & getJavaInfoAttrVendorUpdate() const; +#ifdef WNT /** returns the javaInfo@autoSelect attribute. Before calling this function loadFromSettings must be called. It uses the javaInfo@autoSelect attribute to determine the return value; */ bool getJavaInfoAttrAutoSelect() const; +#endif /** returns an array. Caller must free the strings and the array. |