diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 17:34:16 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 17:34:16 +0000 |
| commit | 9a27e64b3ae6915e38939cf822e3a28c9d93c329 (patch) | |
| tree | ab53c2a3a68da44864221d5e2c1472b0ffc990ca /unotools/source/config/configmgr.cxx | |
| parent | c9e28e9c9712038c9bf46bae13116c9eaedcb754 (diff) | |
INTEGRATION: CWS native72 (1.44.12); FILE MERGED
2006/12/05 08:53:52 pb 1.44.12.1: fix: #i70859# ABOUTBOXPRODUCTVERSION added
Diffstat (limited to 'unotools/source/config/configmgr.cxx')
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 68903ffd9c8b..9f0cd39ef338 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: configmgr.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: obo $ $Date: 2006-09-17 01:23:21 $ + * last change: $Author: ihi $ $Date: 2006-12-19 18:34:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -96,6 +96,8 @@ namespace : public rtl::Static< ::rtl::OUString, BrandName > {}; struct ProductVersion : public rtl::Static< ::rtl::OUString, ProductVersion > {}; + struct AboutBoxProductVersion + : public rtl::Static< ::rtl::OUString, AboutBoxProductVersion > {}; struct ProductExtension : public rtl::Static< ::rtl::OUString, ProductExtension > {}; struct XMLFileFormatName @@ -452,6 +454,13 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) return aRet; } + rtl::OUString &rAboutBoxProductVersion = AboutBoxProductVersion::get(); + if ( eProp == ABOUTBOXPRODUCTVERSION && rAboutBoxProductVersion.getLength() ) + { + aRet <<= rAboutBoxProductVersion; + return aRet; + } + rtl::OUString &rProductExtension = ProductExtension::get(); if ( eProp == PRODUCTEXTENSION && rProductExtension.getLength() ) { @@ -497,7 +506,8 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) case PRODUCTEXTENSION: case PRODUCTXMLFILEFORMATNAME : case PRODUCTXMLFILEFORMATVERSION: - case OPENSOURCECONTEXT: sPath += C2U("Setup/Product"); break; + case OPENSOURCECONTEXT: + case ABOUTBOXPRODUCTVERSION: sPath += C2U("Setup/Product"); break; case DEFAULTCURRENCY: sPath += C2U("Setup/L10N"); break; @@ -529,6 +539,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) case LOCALE: sProperty = C2U("ooLocale"); break; case PRODUCTNAME: sProperty = C2U("ooName"); break; case PRODUCTVERSION: sProperty = C2U("ooSetupVersion"); break; + case ABOUTBOXPRODUCTVERSION: sProperty = C2U("ooSetupVersionAboutBox"); break; case PRODUCTEXTENSION: sProperty = C2U("ooSetupExtension"); break; case PRODUCTXMLFILEFORMATNAME: sProperty = C2U("ooXMLFileFormatName"); break; case PRODUCTXMLFILEFORMATVERSION: sProperty = C2U("ooXMLFileFormatVersion"); break; @@ -568,6 +579,9 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) if ( eProp == PRODUCTVERSION ) aRet >>= rProductVersion; + if ( eProp == ABOUTBOXPRODUCTVERSION ) + aRet >>= rAboutBoxProductVersion; + if ( eProp == PRODUCTEXTENSION ) aRet >>= rProductExtension; |