diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:18:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:18:38 +0000 |
| commit | d3eedabd707e0e21a85f1909d13c7ab0ad35f9ec (patch) | |
| tree | f81d5857b0754853b6a5df7b0c3a39744a1f641e /unotools/source/config/configmgr.cxx | |
| parent | 66efee95176a6976551d0ad8daf9e9954e7aee6a (diff) | |
INTEGRATION: CWS relocinst (1.36.66); FILE MERGED
2004/04/22 11:37:02 kso 1.36.66.1: #116448# - Does no longer use ooSetupInstallPath and OfficeInstall config items.
Diffstat (limited to 'unotools/source/config/configmgr.cxx')
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index be53de148194..e6c5ee21f72a 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: configmgr.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: vg $ $Date: 2003-06-10 11:29:10 $ + * last change: $Author: hr $ $Date: 2004-05-10 14:18:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -412,6 +412,30 @@ rtl::OUString ConfigManager::GetConfigBaseURL() ---------------------------------------------------------------------------*/ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) { + switch(eProp) + { + case INSTALLPATH: + OSL_ENSURE( false, + "ConfigManager::GetDirectConfigProperty: " + "INSTALLPATH no longer supported." ); + return Any(); + case USERINSTALLURL: + OSL_ENSURE( false, + "ConfigManager::GetDirectConfigProperty: " + "USERINSTALLURL no longer supported." ); + return Any(); + case OFFICEINSTALL: + OSL_ENSURE( false, + "ConfigManager::GetDirectConfigProperty: " + "OFFICEINSTALL no longer supported." ); + return Any(); + case OFFICEINSTALLURL: + OSL_ENSURE( false, + "ConfigManager::GetDirectConfigProperty: " + "OFFICEINSTALLURL no longer supported." ); + return Any(); + } + ConfigManager * pTheConfigManager = GetConfigManager(); Any aRet; @@ -442,9 +466,6 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) OUString sPath = C2U(cConfigBaseURL); switch(eProp) { - case INSTALLPATH: - case USERINSTALLURL: sPath += C2U("Setup/Office"); break; - case LOCALE: sPath += C2U("Setup/L10N"); break; case PRODUCTNAME: @@ -452,9 +473,6 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) case PRODUCTEXTENSION: case PRODUCTXMLFILEFORMATVERSION: sPath += C2U("Setup/Product"); break; - case OFFICEINSTALL: - case OFFICEINSTALLURL: sPath += C2U("Office.Common/Path/Current"); break; - case DEFAULTCURRENCY: sPath += C2U("Setup/L10N"); break; } Sequence< Any > aArgs(1); @@ -477,15 +495,11 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) OUString sProperty; switch(eProp) { - case USERINSTALLURL: sProperty = C2U("ooSetupInstallURL"); break; - case INSTALLPATH: sProperty = C2U("ooSetupInstallPath"); break; case LOCALE: sProperty = C2U("ooLocale"); break; case PRODUCTNAME: sProperty = C2U("ooName"); break; case PRODUCTVERSION: sProperty = C2U("ooSetupVersion"); break; case PRODUCTEXTENSION: sProperty = C2U("ooSetupExtension"); break; case PRODUCTXMLFILEFORMATVERSION: sProperty = C2U("ooXMLFileFormatVersion"); break; - case OFFICEINSTALL: sProperty = C2U("OfficeInstall"); break; - case OFFICEINSTALLURL: sProperty = C2U("OfficeInstallURL"); break; case DEFAULTCURRENCY: sProperty = C2U("ooSetupCurrency"); break; } try |