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

[Mike Kaganski (via logerrit)]

 cui/source/dialogs/about.cxx |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 751c6e25a3998845325c9b107163fc23a85b3367
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Apr 7 11:44:48 2022 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Apr 7 14:14:37 2022 +0200

    Make "Calc:" in About dialog's Misc show "default" by default
    
    ... i.e., when neither CL, nor threaded, nor Jumbo are enabled.
    
    Change-Id: I55d4a5e2e9b9a63c8ea2735dbd410603644d0389
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132659
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index dd5df31db6ae..09717ddece4f 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -216,12 +216,12 @@ OUString AboutDialog::GetMiscString() {
     sMisc = EXTRA_BUILDID "\n";
   }
 
-  OUString aCalcMode = "Calc: "; // Calc calculation mode
+  OUString aCalcMode; // Calc calculation mode
 
 #if HAVE_FEATURE_OPENCL
   bool bOpenCL = openclwrapper::GPUEnv::isOpenCLEnabled();
   if (bOpenCL)
-    aCalcMode += "CL";
+    aCalcMode += " CL";
 #else
   const bool bOpenCL = false;
 #endif
@@ -232,18 +232,17 @@ OUString AboutDialog::GetMiscString() {
       UseThreadedCalculationForFormulaGroups::get();
 
   if (!bThreadingProhibited && !bOpenCL && bThreadedCalc) {
-    if (!aCalcMode.endsWith(" "))
-      aCalcMode += " ";
-    aCalcMode += "threaded";
+    aCalcMode += " threaded";
   }
 
   if (officecfg::Office::Calc::Defaults::Sheet::JumboSheets::get())
   {
-    if (!aCalcMode.endsWith(" "))
-      aCalcMode += " ";
-    aCalcMode += "Jumbo";
+    aCalcMode += " Jumbo";
   }
-  sMisc += aCalcMode;
+
+  if (aCalcMode.isEmpty())
+      aCalcMode = " default";
+  sMisc += "Calc:" + aCalcMode;
 
   return sMisc;
 }