From f67d166b30dcba9e854716b29e1035693ef7481b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 1 Oct 2013 17:23:10 +0200 Subject: remove run-time replacement of %WRITERCOMPATIBILITYVERSIONOOO11 Instead hard-code OpenOffice.org 1.1 as the value, since StarOffice and StarSuite are irrelevant. Change-Id: I9ab3d1cf38cf64cd4e440b3ae43158f748ead7d2 --- desktop/source/app/app.cxx | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'desktop') diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 2e3ee0e20efb..267d60afef4b 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -472,8 +472,6 @@ namespace : public rtl::Static< OUString, XMLFileFormatName > {}; struct XMLFileFormatVersion : public rtl::Static< OUString, XMLFileFormatVersion > {}; - struct WriterCompatibilityVersionOOo11 - : public rtl::Static< OUString, WriterCompatibilityVersionOOo11 > {}; } OUString ReplaceStringHookProc( const OUString& rStr ) @@ -528,19 +526,6 @@ OUString ReplaceStringHookProc( const OUString& rStr ) sRet = sRet.replaceAll( "%OOOVENDOR", sOOOVendor ); } - if ( sRet.indexOf( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != -1 ) - { - OUString sWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get(); - if ( sWriterCompatibilityVersionOOo11.isEmpty() ) - { - sWriterCompatibilityVersionOOo11 = - utl::ConfigManager::getWriterCompatibilityVersionOOo_1_1(); - } - - sRet = sRet.replaceAll( "%WRITERCOMPATIBILITYVERSIONOOO11", - sWriterCompatibilityVersionOOo11 ); - } - return sRet; } -- cgit v1.2.3