diff options
| author | Frank Schönheit <fs@openoffice.org> | 2001-08-22 09:02:55 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2001-08-22 09:02:55 +0000 |
| commit | dd5f3728f456afe2332cbb54e67331757ce4d5c1 (patch) | |
| tree | 37aca412083de05ad0941d1485b041d73cf04f86 /unotools | |
| parent | fe3e7cfd2a80761562577784ef15a878e1bf02c4 (diff) | |
#91235# +ConfigProperty::DEFAULTCURRENCY
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/inc/unotools/configmgr.hxx | 7 | ||||
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 14 |
2 files changed, 16 insertions, 5 deletions
diff --git a/unotools/inc/unotools/configmgr.hxx b/unotools/inc/unotools/configmgr.hxx index 5a3e2c108afd..fdab06e0c948 100644 --- a/unotools/inc/unotools/configmgr.hxx +++ b/unotools/inc/unotools/configmgr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: configmgr.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: os $ $Date: 2001-06-25 14:41:45 $ + * last change: $Author: fs $ $Date: 2001-08-22 10:01:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,7 +130,8 @@ namespace utl OFFICEINSTALLURL, PRODUCTNAME, PRODUCTVERSION, - PRODUCTEXTENSION + PRODUCTEXTENSION, + DEFAULTCURRENCY }; //direct readonly access to some special configuration elements static com::sun::star::uno::Any GetDirectConfigProperty(ConfigProperty eProp); diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index fcd8504a439a..ef341d6326b7 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: configmgr.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: os $ $Date: 2001-07-12 10:22:01 $ + * last change: $Author: fs $ $Date: 2001-08-22 10:02:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -463,6 +463,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) case PRODUCTEXTENSION: 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); aArgs[0] <<= sPath; @@ -503,6 +504,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) case USERINSTALLURL: sProperty = C2U("InstallURL"); break; case OFFICEINSTALLURL: sProperty = C2U("OfficeInstallURL"); break; #endif + case DEFAULTCURRENCY: sProperty += C2U("ooSetupCurrency"); break; } try { @@ -510,6 +512,14 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) } catch(Exception&) { + OSL_ENSURE( sal_False, + ( ::rtl::OString( "ConfigManager::GetDirectConfigProperty: could not retrieve the property \"" ) + += ::rtl::OString( sProperty.getStr(), sProperty.getLength(), RTL_TEXTENCODING_ASCII_US ) + += ::rtl::OString( "\" under \"" ) + += ::rtl::OString( sPath.getStr(), sPath.getLength(), RTL_TEXTENCODING_ASCII_US ) + += ::rtl::OString( "\" (caught an exception)!" ) + ).getStr() + ); } } |