[Libreoffice-commits] core.git: cui/source vcl/source

[Mike Kaganski (via logerrit)]

 cui/source/dialogs/about.cxx |   12 +++++-------
 vcl/source/app/svapp.cxx     |   30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 22 deletions(-)

New commits:
commit 8bc1dcf22df49fa1fb5c858a8f0f44143d41d6f7
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri May 22 12:17:08 2020 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat May 23 07:06:09 2020 +0200

    Tidy up generation of Application::GetHWOSConfInfo
    
    ... so that it doesn't add "; " in the end unconditionally. This makes
    version info in About dialog prettier.
    
    Change-Id: I914b8bd808230681f768c9da679941c604fc5eab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94671
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 9dd4e108a24d..53f05d52b2e1 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -255,13 +255,11 @@ IMPL_LINK_NOARG(AboutDialog, HandleClick, weld::Button &, void) {
       css::datatransfer::clipboard::SystemClipboard::create(
           comphelper::getProcessComponentContext());
 
-  OUString sInfo;
-  sInfo += "Version: " + m_pVersionLabel->get_label() + "\n";
-  sInfo += "Build ID: " + GetBuildString() + "\n";
-  sInfo += m_pEnvLabel->get_label();
-  sInfo += m_pUILabel->get_label() + "\n";
-  sInfo += "Locale: " + m_pLocaleLabel->get_label() + "\n";
-  sInfo += m_pMiscLabel->get_label();
+  OUString sInfo = "Version: " + m_pVersionLabel->get_label() // version
+                   + "\nBuild ID: " + GetBuildString() // build id
+                   + "\n" + m_pEnvLabel->get_label() + "; " + m_pUILabel->get_label() // env+UI
+                   + "\nLocale: " + m_pLocaleLabel->get_label() // locale
+                   + "\n" + m_pMiscLabel->get_label(); // misc
 
   vcl::unohelper::TextDataObject::CopyStringTo(sInfo, xClipboard);
 }
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index fe650087d026..ea01d31c0829 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1140,10 +1140,15 @@ OUString Application::GetHWOSConfInfo(const int bSelection)
     ImplSVData* pSVData = ImplGetSVData();
     OUStringBuffer aDetails;
 
+    const auto appendDetails = [&aDetails](const OUStringLiteral& sep, auto&& val) {
+        if (!aDetails.isEmpty() && sep.getLength())
+            aDetails.append(sep);
+        aDetails.append(std::move(val));
+    };
+
     if (bSelection != hwUI) {
-        aDetails.append( VclResId(SV_APP_CPUTHREADS) );
-        aDetails.append( static_cast<sal_Int32>(std::thread::hardware_concurrency()) );
-        aDetails.append( "; " );
+        appendDetails("; ", VclResId(SV_APP_CPUTHREADS)
+                                + OUString::number(std::thread::hardware_concurrency()));
 
         OUString aVersion;
         if ( pSVData && pSVData->mpDefInst )
@@ -1151,23 +1156,21 @@ OUString Application::GetHWOSConfInfo(const int bSelection)
         else
             aVersion = "-";
 
-        aDetails.append( VclResId(SV_APP_OSVERSION) );
-        aDetails.append( aVersion );
-        aDetails.append( "; " );
+        appendDetails("; ", VclResId(SV_APP_OSVERSION) + aVersion);
     }
 
     if (bSelection != hwEnv) {
-        aDetails.append( VclResId(SV_APP_UIRENDER) );
+        appendDetails("; ", VclResId(SV_APP_UIRENDER));
 #if HAVE_FEATURE_SKIA
         if ( SkiaHelper::isVCLSkiaEnabled() )
         {
             switch(SkiaHelper::renderMethodToUse())
             {
                 case SkiaHelper::RenderVulkan:
-                    aDetails.append( VclResId(SV_APP_SKIA_VULKAN) );
+                    appendDetails("", VclResId(SV_APP_SKIA_VULKAN));
                     break;
                 case SkiaHelper::RenderRaster:
-                    aDetails.append( VclResId(SV_APP_SKIA_RASTER) );
+                    appendDetails("", VclResId(SV_APP_SKIA_RASTER));
                     break;
             }
         }
@@ -1175,16 +1178,13 @@ OUString Application::GetHWOSConfInfo(const int bSelection)
 #endif
 #if HAVE_FEATURE_OPENGL
         if ( OpenGLWrapper::isVCLOpenGLEnabled() )
-            aDetails.append( VclResId(SV_APP_GL) );
+            appendDetails("", VclResId(SV_APP_GL));
         else
 #endif
-            aDetails.append( VclResId(SV_APP_DEFAULT) );
-        aDetails.append( "; " );
+            appendDetails("", VclResId(SV_APP_DEFAULT));
 
 #if (defined LINUX || defined _WIN32 || defined MACOSX)
-        aDetails.append( SV_APP_VCLBACKEND );
-        aDetails.append( GetToolkitName() );
-        aDetails.append( "; " );
+        appendDetails("; ", SV_APP_VCLBACKEND + GetToolkitName());
 #endif
     }