From 130c1ae09451c268fcd4f2d55f65ac7dc9581342 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Sat, 16 Nov 2019 10:36:24 +0200 Subject: Replace some std::once with static initializers Change-Id: I6234bc252dac5b1c29e3f1ef844cf51f56aaa7ac Reviewed-on: https://gerrit.libreoffice.org/82970 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- desktop/source/app/app.cxx | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'desktop') diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index ef94b0d96da3..31f7abbf9b4e 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -394,18 +394,12 @@ namespace OUString ReplaceStringHookProc( const OUString& rStr ) { - const static OUString sBuildId(utl::Bootstrap::getBuildIdData("development")); - static OUString sBrandName, sVersion, sAboutBoxVersion, sAboutBoxVersionSuffix, sExtension; - - static std::once_flag aInitOnce; - std::call_once(aInitOnce, [] - { - sBrandName = utl::ConfigManager::getProductName(); - sVersion = utl::ConfigManager::getProductVersion(); - sAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion(); - sAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix(); - sExtension = utl::ConfigManager::getProductExtension(); - } ); + const static OUString sBuildId(utl::Bootstrap::getBuildIdData("development")), + sBrandName(utl::ConfigManager::getProductName()), + sVersion(utl::ConfigManager::getProductVersion()), + sAboutBoxVersion(utl::ConfigManager::getAboutBoxProductVersion()), + sAboutBoxVersionSuffix(utl::ConfigManager::getAboutBoxProductVersionSuffix()), + sExtension(utl::ConfigManager::getProductExtension()); OUString sRet(rStr); if (sRet.indexOf("%PRODUCT") != -1 || sRet.indexOf("%ABOUTBOX") != -1) -- cgit