diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:18:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:18:22 +0000 |
| commit | 84c7504140499c39c475e8c9854e8f9385974ef3 (patch) | |
| tree | 57191ea26d99b463c72d1512c03051acb58c4fa2 /configmgr | |
| parent | 691b78837f41dc5858aa4ddcc14022170bd1260d (diff) | |
INTEGRATION: CWS warnings01 (1.5.22); FILE MERGED
2005/09/22 16:30:29 sb 1.5.22.2: RESYNC: (1.5-1.6); FILE MERGED
2005/09/06 12:27:37 cd 1.5.22.1: #i53898# Make code warning free
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/backend/binarycache.cxx | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/configmgr/source/backend/binarycache.cxx b/configmgr/source/backend/binarycache.cxx index 5b4e19b8f9..1cd46aae6d 100644 --- a/configmgr/source/backend/binarycache.cxx +++ b/configmgr/source/backend/binarycache.cxx @@ -4,9 +4,9 @@ * * $RCSfile: binarycache.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-08 03:25:41 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:18:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -156,27 +156,28 @@ namespace configmgr OUString sCacheUrl; if (!aReader.isAdminService()) { - mbCacheEnabled = (aReader.getBestContext()->getValueByName(aSettingName) >>= sCacheUrl) + mbCacheEnabled = (aReader.getBestContext()->getValueByName(aSettingName) >>= sCacheUrl) && implEnsureAbsoluteURL(sCacheUrl); - } + } - if (mbCacheEnabled) - { - mBaseURL = sCacheUrl; + if (mbCacheEnabled) + { + mBaseURL = sCacheUrl; if (!FileHelper::dirExists(sCacheUrl)) { - if (osl::File::RC errorCode = FileHelper::mkdirs(sCacheUrl)) - { + osl::File::RC errorCode = FileHelper::mkdirs(sCacheUrl); + if (errorCode) + { #if (OSL_DEBUG_LEVEL > 0) - rtl::OString sURL = rtl::OUStringToOString(sCacheUrl,RTL_TEXTENCODING_ASCII_US); + rtl::OString sURL = rtl::OUStringToOString(sCacheUrl,RTL_TEXTENCODING_ASCII_US); rtl::OString sErr = rtl::OUStringToOString(FileHelper::createOSLErrorString(errorCode),RTL_TEXTENCODING_ASCII_US); - ::osl_trace("Configuration: Cannot create cache directory \"%s\". " - "Error is %s [%d]",sURL.getStr(),sErr.getStr(),int(errorCode)) ; + ::osl_trace("Configuration: Cannot create cache directory \"%s\". " + "Error is %s [%d]",sURL.getStr(),sErr.getStr(),int(errorCode)) ; #endif - mbCacheEnabled = false; + mbCacheEnabled = false; } } - } + } } // ----------------------------------------------------------------------------- |