mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dead rtl::Static instances

Browse Source 
...effectively dead ever since c1758889cb "Heavily
simplified utl::ConfigManager" changed the references into them (rBrandName
etc.) into non-references (for reasons lost).

Change-Id: Ib77fb458ade9d9b53ec5c1cc1e38785a47c42c42
This commit is contained in:
Stephan Bergmann
2017-05-16 15:09:14 +02:00
parent c7e31f4921
commit a40e0d00ba
1 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
desktop/source/app/app.cxx
View File

@@ -456,18 +456,8 @@ CommandLineArgs& Desktop::GetCommandLineArgs()
namespace namespace
{ {
struct BrandName
: public rtl::Static< OUString, BrandName > {};
struct Version
: public rtl::Static< OUString, Version > {};
struct AboutBoxVersion
: public rtl::Static< OUString, AboutBoxVersion > {};
struct AboutBoxVersionSuffix
: public rtl::Static< OUString, AboutBoxVersionSuffix > {};
struct OOOVendor struct OOOVendor
: public rtl::Static< OUString, OOOVendor > {}; : public rtl::Static< OUString, OOOVendor > {};
struct Extension
: public rtl::Static< OUString, Extension > {};
} }
OUString ReplaceStringHookProc( const OUString& rStr ) OUString ReplaceStringHookProc( const OUString& rStr )
@@ -478,23 +468,11 @@ OUString ReplaceStringHookProc( const OUString& rStr )
static std::once_flag aInitOnce; static std::once_flag aInitOnce;
std::call_once(aInitOnce, [] std::call_once(aInitOnce, []
{ {
sBrandName = BrandName::get(); sBrandName = utl::ConfigManager::getProductName();
sVersion = Version::get(); sVersion = utl::ConfigManager::getProductVersion();
sAboutBoxVersion = AboutBoxVersion::get(); sAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); sAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
sExtension = Extension::get(); sExtension = utl::ConfigManager::getProductExtension();
if ( sBrandName.isEmpty() )
{
sBrandName = utl::ConfigManager::getProductName();
sVersion = utl::ConfigManager::getProductVersion();
sAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
sAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
if (sExtension.isEmpty())
{
sExtension = utl::ConfigManager::getProductExtension();
}
}
} ); } );
OUString sRet(rStr); OUString sRet(rStr);