diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:14:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:14:15 +0000 |
| commit | 32e05a661918e23d411d6330c722d1415cc6701b (patch) | |
| tree | 5912dcfa0614e93d4d778035eb2df19cb47a521b /desktop | |
| parent | 6e73558e0bce4fbe4b72d0a10bca48e0aa0077a0 (diff) | |
INTEGRATION: CWS relocinst (1.4.22); FILE MERGED
2004/04/22 11:08:16 kso 1.4.22.1: #116448# - Does no longer store ooSetupInstallPath and OfficeInstall config items.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/userinstall.cxx | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index efdbdd40e8a9..eb95d3174fda 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -2,9 +2,9 @@ * * $RCSfile: userinstall.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2004-03-09 11:07:59 $ + * last change: $Author: hr $ $Date: 2004-05-10 14:14:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -286,8 +286,6 @@ namespace desktop { localizable->setLocale(aLocale); // org.openoffice.Setup/L10N/ooLocale - // org.openoffice.Setup/Office/ooSetupInstallPath - // org.openoffice.Common/Path/Current/OfficeInstall // org.openoffice.Office.Linguistic/General/DefaultLocale // org.openoffice.Office.Linguistic/General/DefaultLocale_CJK @@ -300,20 +298,10 @@ namespace desktop { theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW); hpset->setHierarchicalPropertyValue(OUString::createFromAscii("L10N/ooLocale"), makeAny(aUserLanguage)); Reference< XChangesBatch >(hpset, UNO_QUERY_THROW)->commitChanges(); - hpset->setHierarchicalPropertyValue(OUString::createFromAscii("Office/ooSetupInstallPath"), makeAny(aUserPath)); - Reference< XChangesBatch >(hpset, UNO_QUERY_THROW)->commitChanges(); - - v.Value <<= OUString::createFromAscii("org.openoffice.Office.Common/Path/Current"); - theArgs[0] <<= v; - Reference< XPropertySet > pset = Reference< XPropertySet >( - theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW); - pset->setPropertyValue(OUString::createFromAscii("OfficeInstall"), - makeAny(aBasePath+OUString::createFromAscii("/program"))); - Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges(); v.Value <<= OUString::createFromAscii("org.openoffice.Office.Linguistic/General"); theArgs[0] <<= v; - pset = Reference< XPropertySet >( + Reference< XPropertySet > pset = Reference< XPropertySet >( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW); if (aUserLanguage.equalsAscii("ja") || aUserLanguage.equalsAscii("ko") || aUserLanguage.equalsAscii("zh-CN") || aUserLanguage.equalsAscii("zh-TW")) |