diff options
| author | Joachim Lingner <jl@openoffice.org> | 2004-05-20 07:50:59 +0000 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2004-05-20 07:50:59 +0000 |
| commit | 56c7be7fee90071dc4d1ef7ed378afde55614486 (patch) | |
| tree | a612e227fd29130417783ba54622e5b7b7f9619d /jvmfwk | |
| parent | 3d3799fc61698a56fc55c6ee9d6d0ec77ae719e1 (diff) | |
#i20052#
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/elements.cxx | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 157a1207822c..07e6aedb7aff 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -2,9 +2,9 @@ * * $RCSfile: elements.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: jl $ $Date: 2004-05-13 11:15:01 $ + * last change: $Author: jl $ $Date: 2004-05-20 08:50:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,25 +132,19 @@ bool createUserDirectory() "${$SYSBINDIR/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}"))); FileBase::RC rc = Directory::create(sUserDir); - if (rc == FileBase::E_None) + if (rc == FileBase::E_None || rc == FileBase::E_EXIST) { // .StarOfficeXXX file created in home directory sUserDir += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/user")); FileBase::RC rc = Directory::create(sUserDir); - if (rc == FileBase::E_None) + if (rc == FileBase::E_None || rc == FileBase::E_EXIST) { sUserDir += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/config")); FileBase::RC rc = Directory::create(sUserDir); - if (rc == FileBase::E_None) + if (rc == FileBase::E_None || rc == FileBase::E_EXIST) ret = true; } } - else if (rc == FileBase::E_EXIST) - { - ret = true; - } - // if the folder exists then all subdirectories should exist as well - return ret; } javaFrameworkError createUserSettingsDocument() @@ -436,7 +430,8 @@ javaFrameworkError CNodeJava::loadUserSettings() javaFrameworkError errcode = JFW_E_NONE; CXmlDocPtr docUser; - javaFrameworkError err = prepareSettingsDocument(); + if ((errcode = prepareSettingsDocument()) != JFW_E_NONE) + return errcode; //Read the user elements rtl::OString sSettingsPath = jfw::getUserSettingsPath(); @@ -678,7 +673,9 @@ javaFrameworkError CNodeJava::writeSettings() const CXPathContextPtr contextUser; CXPathObjectPtr pathObj; - javaFrameworkError err = prepareSettingsDocument(); + if ((errcode = prepareSettingsDocument()) != JFW_E_NONE) + return errcode; + //Read the user elements rtl::OString sSettingsPath = jfw::getUserSettingsPath(); docUser = xmlParseFile(sSettingsPath.getStr()); |