diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-01 17:46:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-01 18:03:38 +0200 |
| commit | abd3338486a515380d50c4ee5f4ab242fb5fd4bd (patch) | |
| tree | 83a9689e4069ab51cd6cc5e4764513fffb7ec700 /desktop/source/app | |
| parent | 31e37f8f405d53ad0d5b1a271e07976328f93d64 (diff) | |
desktop: stop replacing %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION
... and %PRODUCTXMLFILEFORMATNAME at runtime and hard-code
OpenOffice.org 1.0 for these too.
Change-Id: Id96390506d2a0f367f932e85d3115362ad483bc3
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/app.cxx | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 267d60afef4b..c06295630d04 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -468,10 +468,6 @@ namespace : public rtl::Static< OUString, OOOVendor > {}; struct Extension : public rtl::Static< OUString, Extension > {}; - struct XMLFileFormatName - : public rtl::Static< OUString, XMLFileFormatName > {}; - struct XMLFileFormatVersion - : public rtl::Static< OUString, XMLFileFormatVersion > {}; } OUString ReplaceStringHookProc( const OUString& rStr ) @@ -486,15 +482,10 @@ OUString ReplaceStringHookProc( const OUString& rStr ) OUString sAboutBoxVersion = AboutBoxVersion::get(); OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); OUString sExtension = Extension::get(); - OUString sXMLFileFormatName = XMLFileFormatName::get(); - OUString sXMLFileFormatVersion = XMLFileFormatVersion::get(); if ( sBrandName.isEmpty() ) { sBrandName = utl::ConfigManager::getProductName(); - sXMLFileFormatName = utl::ConfigManager::getProductXmlFileFormat(); - sXMLFileFormatVersion = - utl::ConfigManager::getProductXmlFileFormatVersion(); sVersion = utl::ConfigManager::getProductVersion(); sAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion(); sAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix(); @@ -510,8 +501,6 @@ OUString ReplaceStringHookProc( const OUString& rStr ) sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix ); sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion ); sRet = sRet.replaceAll( "%PRODUCTEXTENSION", sExtension ); - sRet = sRet.replaceAll( "%PRODUCTXMLFILEFORMATNAME", sXMLFileFormatName ); - sRet = sRet.replaceAll( "%PRODUCTXMLFILEFORMATVERSION", sXMLFileFormatVersion ); } if ( sRet.indexOf( "%OOOVENDOR" ) != -1 ) |