diff options
| author | Dirk Grobler <dg@openoffice.org> | 2001-09-26 14:49:46 +0000 |
|---|---|---|
| committer | Dirk Grobler <dg@openoffice.org> | 2001-09-26 14:49:46 +0000 |
| commit | 39da0a204ed0a6b7f692f2fa518bcb59e4b8b79f (patch) | |
| tree | 5348c3ed46fd9a52903fa05dd286651bd5d19320 /unotools | |
| parent | 3701c7193adbc3acf4b79834449e3b476f71a68b (diff) | |
#92427# remove TF_CFGDATA
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index ef341d6326b7..5828b29d7aa6 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: configmgr.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: fs $ $Date: 2001-08-22 10:02:55 $ + * last change: $Author: dg $ $Date: 2001-09-26 15:49:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -451,13 +451,8 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) switch(eProp) { case INSTALLPATH: -#ifdef TF_CFGDATA case USERINSTALLURL: sPath += C2U("Setup/Office"); break; case LOCALE: sPath += C2U("Setup/L10N"); break; -#else - case USERINSTALLURL: sPath += C2U("UserProfile/Office"); break; - case LOCALE: sPath += C2U("UserProfile/International"); break; -#endif case PRODUCTNAME: case PRODUCTVERSION: case PRODUCTEXTENSION: sPath += C2U("Setup/Product"); break; @@ -485,7 +480,6 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) OUString sProperty; switch(eProp) { -#ifdef TF_CFGDATA case USERINSTALLURL: sProperty = C2U("ooSetupInstallURL"); break; case INSTALLPATH: sProperty = C2U("ooSetupInstallPath"); break; case LOCALE: sProperty = C2U("ooLocale"); break; @@ -494,16 +488,6 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) case PRODUCTEXTENSION: sProperty = C2U("ooSetupExtension"); break; case OFFICEINSTALL: sProperty = C2U("OfficeInstall"); break; case OFFICEINSTALLURL: sProperty = C2U("OfficeInstallURL"); break; -#else - case INSTALLPATH: sProperty = C2U("InstallPath"); break; - case LOCALE: sProperty = C2U("Locale"); break; - case PRODUCTNAME: sProperty = C2U("Name"); break; - case PRODUCTVERSION: sProperty = C2U("Version"); break; - case PRODUCTEXTENSION: sProperty = C2U("Extension"); break; - case OFFICEINSTALL: sProperty = C2U("OfficeInstall"); break; - case USERINSTALLURL: sProperty = C2U("InstallURL"); break; - case OFFICEINSTALLURL: sProperty = C2U("OfficeInstallURL"); break; -#endif case DEFAULTCURRENCY: sProperty += C2U("ooSetupCurrency"); break; } try |