diff options
author | Heiko Tietze <tietze.heiko@gmail.com> | 2020-04-29 11:39:57 +0200 |
---|---|---|
committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2020-04-29 19:09:39 +0200 |
commit | ab846145bbd56f4308c8657df8b1354a403edd74 (patch) | |
tree | 6867760584cff9eba04ab197ba01004470246564 /vcl | |
parent | 3aa11fb2b425e2f4bb1b47fed8782423d2b6f269 (diff) |
Resolves tdf#132322 - Link to Gerrit hash reintroduced
Mulit-line label split, Build realized as link_button
Required changes also solve tdf#132066 partially as many
localized strings are not anymore copied to clipboard
Change-Id: I346fdc65cd1734f17854eccd587fe0b7e216e720
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93119
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/app/svapp.cxx | 70 |
1 files changed, 38 insertions, 32 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 651d4aa456dd..db0a09ddb2db 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1133,54 +1133,60 @@ OUString Application::GetAppName() return OUString(); } -OUString Application::GetHWOSConfInfo() +enum {hwAll=0, hwEnv=1, hwUI=2}; + +OUString Application::GetHWOSConfInfo(const int bSelection) { ImplSVData* pSVData = ImplGetSVData(); OUStringBuffer aDetails; - aDetails.append( VclResId(SV_APP_CPUTHREADS) ); - aDetails.append( static_cast<sal_Int32>(std::thread::hardware_concurrency()) ); - aDetails.append( "; " ); + if (bSelection != hwUI) { + aDetails.append( VclResId(SV_APP_CPUTHREADS) ); + aDetails.append( static_cast<sal_Int32>(std::thread::hardware_concurrency()) ); + aDetails.append( "; " ); - OUString aVersion; - if ( pSVData && pSVData->mpDefInst ) - aVersion = pSVData->mpDefInst->getOSVersion(); - else - aVersion = "-"; + OUString aVersion; + if ( pSVData && pSVData->mpDefInst ) + aVersion = pSVData->mpDefInst->getOSVersion(); + else + aVersion = "-"; - aDetails.append( VclResId(SV_APP_OSVERSION) ); - aDetails.append( aVersion ); - aDetails.append( "; " ); + aDetails.append( VclResId(SV_APP_OSVERSION) ); + aDetails.append( aVersion ); + aDetails.append( "; " ); + } - aDetails.append( VclResId(SV_APP_UIRENDER) ); + if (bSelection != hwEnv) { + aDetails.append( VclResId(SV_APP_UIRENDER) ); #if HAVE_FEATURE_SKIA - if ( SkiaHelper::isVCLSkiaEnabled() ) - { - switch(SkiaHelper::renderMethodToUse()) + if ( SkiaHelper::isVCLSkiaEnabled() ) { - case SkiaHelper::RenderVulkan: - aDetails.append( VclResId(SV_APP_SKIA_VULKAN) ); - break; - case SkiaHelper::RenderRaster: - aDetails.append( VclResId(SV_APP_SKIA_RASTER) ); - break; + switch(SkiaHelper::renderMethodToUse()) + { + case SkiaHelper::RenderVulkan: + aDetails.append( VclResId(SV_APP_SKIA_VULKAN) ); + break; + case SkiaHelper::RenderRaster: + aDetails.append( VclResId(SV_APP_SKIA_RASTER) ); + break; + } } - } - else + else #endif #if HAVE_FEATURE_OPENGL - if ( OpenGLWrapper::isVCLOpenGLEnabled() ) - aDetails.append( VclResId(SV_APP_GL) ); - else + if ( OpenGLWrapper::isVCLOpenGLEnabled() ) + aDetails.append( VclResId(SV_APP_GL) ); + else #endif - aDetails.append( VclResId(SV_APP_DEFAULT) ); - aDetails.append( "; " ); + aDetails.append( VclResId(SV_APP_DEFAULT) ); + aDetails.append( "; " ); #if (defined LINUX || defined _WIN32 || defined MACOSX) - aDetails.append( SV_APP_VCLBACKEND ); - aDetails.append( GetToolkitName() ); - aDetails.append( "; " ); + aDetails.append( SV_APP_VCLBACKEND ); + aDetails.append( GetToolkitName() ); + aDetails.append( "; " ); #endif + } return aDetails.makeStringAndClear(); } |