From 310012041bf0b43868527c3a523c97c2cde4fca1 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Sat, 11 Jan 2020 18:32:28 +0300 Subject: Replace an rtl::Static use with a static OOOVendor was apparently a leftover from commit a40e0d00ba597a12de42334ee78af9c5fc68e65e "Remove dead rtl::Static instances". Change-Id: Idbcf83cbd24ff7102157ba7285f4fcebd6675611 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86604 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- desktop/source/app/app.cxx | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'desktop') diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index eff6f70df610..ea01399eb954 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -396,12 +396,6 @@ CommandLineArgs& Desktop::GetCommandLineArgs() return theCommandLineArgs::get(); } -namespace -{ - struct OOOVendor - : public rtl::Static< OUString, OOOVendor > {}; -} - OUString ReplaceStringHookProc( const OUString& rStr ) { const static OUString sBuildId(utl::Bootstrap::getBuildIdData("development")), @@ -424,13 +418,7 @@ OUString ReplaceStringHookProc( const OUString& rStr ) if ( sRet.indexOf( "%OOOVENDOR" ) != -1 ) { - OUString sOOOVendor = OOOVendor::get(); - - if ( sOOOVendor.isEmpty() ) - { - sOOOVendor = utl::ConfigManager::getVendor(); - } - + const static OUString sOOOVendor = utl::ConfigManager::getVendor(); sRet = sRet.replaceAll( "%OOOVENDOR", sOOOVendor ); } -- cgit