diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 14:46:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 14:46:40 +0000 |
| commit | d64cf1af9ad9f2ea14b97e0ecf4cc84a61c52cef (patch) | |
| tree | 8b5151463e3c9d9333ff2844cbab61d46d53e0c6 /desktop | |
| parent | 40d84e9139986de2f138c674812fd9c973e6cd6d (diff) | |
INTEGRATION: CWS migration1 (1.13.20); FILE MERGED
2004/10/27 14:51:18 lo 1.13.20.2: #116053# change /user -> /presets
2004/08/30 12:54:02 lo 1.13.20.1: #i33255# first start wizard
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/userinstall.cxx | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 291a51a0dfa3..89029b011dd9 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -2,9 +2,9 @@ * * $RCSfile: userinstall.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: lo $ $Date: 2004-07-28 15:02:07 $ + * last change: $Author: obo $ $Date: 2004-11-15 15:46:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -286,11 +286,16 @@ namespace desktop { return err; } - static const char *pszCopyList[] = { + static const char *pszSrcList[] = { + "/presets", + NULL + }; + static const char *pszDstList[] = { "/user", NULL }; + UserInstall::UserInstallError UserInstall::configureLanguage() { try @@ -362,11 +367,11 @@ namespace desktop { if ((rc != FileBase::E_None) && (rc != FileBase::E_EXIST)) return UserInstall::E_Creation; // copy data from shared data directory of base installation - for (sal_Int32 i=0; pszCopyList[i]!=NULL; i++) + for (sal_Int32 i=0; pszSrcList[i]!=NULL && pszDstList[i]!=NULL; i++) { rc = copy_recursive( - aBasePath + OUString::createFromAscii(pszCopyList[i]), - aUserPath + OUString::createFromAscii(pszCopyList[i])); + aBasePath + OUString::createFromAscii(pszSrcList[i]), + aUserPath + OUString::createFromAscii(pszDstList[i])); if ((rc != FileBase::E_None) && (rc != FileBase::E_EXIST)) return UserInstall::E_Creation; } try @@ -388,8 +393,11 @@ namespace desktop { hpset->setHierarchicalPropertyValue(OUString::createFromAscii("Office/ooSetupInstCompleted"), makeAny(sal_True)); Reference< XChangesBatch >(hpset, UNO_QUERY_THROW)->commitChanges(); } - catch (Exception&) + catch (Exception& e) { + OString aMsg("create_user_install(): "); + aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); + OSL_ENSURE(sal_False, aMsg.getStr()); return UserInstall::E_Creation; } |