diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:23:01 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:23:01 +0000 |
| commit | 2dd514292394e71e37fb5165c976cf139d1505f2 (patch) | |
| tree | 9939246762c75828c6fa0ec7d00a914c1d2dff59 /unotools | |
| parent | 4eb296c9ac90286af142fa25229d503bc1d3786b (diff) | |
INTEGRATION: CWS fwk16 (1.39.44); FILE MERGED
2005/06/08 09:08:14 pb 1.39.44.1: fix: #i42139# PRODUCTXMLFILEFORMATNAME added
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index b5b2d3f1affa..52b91a2d0724 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: configmgr.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: kz $ $Date: 2004-08-02 13:47:32 $ + * last change: $Author: kz $ $Date: 2005-07-12 14:23:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,6 +118,8 @@ namespace : public rtl::Static< ::rtl::OUString, ProductVersion > {}; struct ProductExtension : public rtl::Static< ::rtl::OUString, ProductExtension > {}; + struct XMLFileFormatName + : public rtl::Static< ::rtl::OUString, XMLFileFormatName > {}; struct XMLFileFormatVersion : public rtl::Static< ::rtl::OUString, XMLFileFormatVersion > {}; struct WriterCompatibilityVersionOOo11 @@ -472,6 +474,13 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) return aRet; } + rtl::OUString &rXMLFileFormatName = XMLFileFormatName::get(); + if ( eProp == PRODUCTXMLFILEFORMATNAME && rXMLFileFormatName.getLength() ) + { + aRet <<= rXMLFileFormatName; + return aRet; + } + rtl::OUString &rXMLFileFormatVersion = XMLFileFormatVersion::get(); if ( eProp == PRODUCTXMLFILEFORMATVERSION && rXMLFileFormatVersion.getLength() ) { @@ -494,6 +503,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) case PRODUCTNAME: case PRODUCTVERSION: case PRODUCTEXTENSION: + case PRODUCTXMLFILEFORMATNAME : case PRODUCTXMLFILEFORMATVERSION: sPath += C2U("Setup/Product"); break; case DEFAULTCURRENCY: sPath += C2U("Setup/L10N"); break; @@ -525,6 +535,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) case PRODUCTNAME: sProperty = C2U("ooName"); break; case PRODUCTVERSION: sProperty = C2U("ooSetupVersion"); break; case PRODUCTEXTENSION: sProperty = C2U("ooSetupExtension"); break; + case PRODUCTXMLFILEFORMATNAME: sProperty = C2U("ooXMLFileFormatName"); break; case PRODUCTXMLFILEFORMATVERSION: sProperty = C2U("ooXMLFileFormatVersion"); break; case DEFAULTCURRENCY: sProperty = C2U("ooSetupCurrency"); break; case WRITERCOMPATIBILITYVERSIONOOO11: sProperty = C2U("OOo11"); break; @@ -549,6 +560,9 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp) if ( eProp == PRODUCTNAME ) aRet >>= rBrandName; + if ( eProp == PRODUCTXMLFILEFORMATNAME ) + aRet >>= rXMLFileFormatName; + if ( eProp == PRODUCTXMLFILEFORMATVERSION ) aRet >>= rXMLFileFormatVersion; |