diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:29:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:29:16 +0000 |
| commit | 6c1bb534987df571fe10b86fe8f4b29676d955c9 (patch) | |
| tree | 6982a4a78a57f99d1c21d95b36594f65fccaef0c /desktop | |
| parent | 9507d4ef06eb580326bf4c76a98f06e5f83f4d74 (diff) | |
INTEGRATION: CWS fwk16 (1.179.6); FILE MERGED
2005/06/08 09:10:07 pb 1.179.6.1: fix: #i42139# support for added
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d81ce1fc4846..03ad73d2313a 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.181 $ + * $Revision: 1.182 $ * - * last change: $Author: obo $ $Date: 2005-07-08 09:30:10 $ + * last change: $Author: kz $ $Date: 2005-07-12 14:29:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -543,6 +543,8 @@ namespace : public rtl::Static< String, Version > {}; struct Extension : public rtl::Static< String, Extension > {}; + struct XMLFileFormatName + : public rtl::Static< String, XMLFileFormatName > {}; struct XMLFileFormatVersion : public rtl::Static< String, XMLFileFormatVersion > {}; struct WriterCompatibilityVersionOOo11 @@ -559,6 +561,7 @@ void ReplaceStringHookProc( UniString& rStr ) String &rBrandName = BrandName::get(); String &rVersion = Version::get(); String &rExtension = Extension::get(); + String &rXMLFileFormatName = XMLFileFormatName::get(); String &rXMLFileFormatVersion = XMLFileFormatVersion::get(); if ( !rBrandName.Len() ) @@ -568,6 +571,10 @@ void ReplaceStringHookProc( UniString& rStr ) aRet >>= aTmp; rBrandName = aTmp; + aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTXMLFILEFORMATNAME ); + aRet >>= aTmp; + rXMLFileFormatName = aTmp; + aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTXMLFILEFORMATVERSION ); aRet >>= aTmp; rXMLFileFormatVersion = aTmp; @@ -588,6 +595,7 @@ void ReplaceStringHookProc( UniString& rStr ) rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rBrandName ); rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion ); rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension ); + rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATNAME", rXMLFileFormatName ); rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATVERSION", rXMLFileFormatVersion ); } |