ODFStudio: expose Studio build feature to C++

Change-Id: Iba7bcfe420553cd45278b391d02f08bbe329648c

config_host/config_features.h.in

@@ -150,4 +150,9 @@
  */
 #define HAVE_FEATURE_JUMBO_SHEETS 0
 
+/*
+ * Whether ODFStudio experimental and instrumentation features are enabled.
+ */
+#define HAVE_FEATURE_ODFSTUDIO 0
+
 #endif

configure.ac

@@ -34,15 +34,7 @@ fi
 save_CC=$CC
 save_CXX=$CXX
 
-if test "x$enable_studio" = "xyes"; then
-    ENABLE_ODFSTUDIO=TRUE
-    AC_DEFINE([ENABLE_ODFSTUDIO], [1],
-        [Build with ODF Studio instrumentation])
-else
-    ENABLE_ODFSTUDIO=
-fi
 
-AC_SUBST([ENABLE_ODFSTUDIO])
 first_arg_basename()
 {
     for i in $1; do
@@ -2653,6 +2645,8 @@ AC_ARG_ENABLE(bundle-mariadb,
     AS_HELP_STRING([--enable-bundle-mariadb],
         [When using MariaDB/MySQL libraries already on system, bundle them with the MariaDB Connector/LibreOffice.])
 )
+
+
 dnl ===================================================================
 dnl ODF Studio (optional experimental modules)
 dnl ===================================================================
@@ -2665,10 +2659,16 @@ AC_ARG_ENABLE([studio],
 
 if test "x$enable_studio" = "xyes"; then
     ENABLE_ODFSTUDIO=TRUE
+    AC_DEFINE([HAVE_FEATURE_ODFSTUDIO], [1],
+        [Whether ODFStudio experimental and instrumentation features are enabled])
 else
     ENABLE_ODFSTUDIO=
 fi
 
+AC_SUBST([ENABLE_ODFSTUDIO])
+
+
+
 AC_SUBST([ENABLE_ODFSTUDIO])
 AC_ARG_WITH(system-postgresql,
     AS_HELP_STRING([--with-system-postgresql],

cui/source/dialogs/about.cxx

@@ -157,8 +157,18 @@ OUString AboutDialog::GetVersionString()
     auto const ok = rtl::Bootstrap::get(u"_ARCH"_ustr, arch);
     assert(ok);
     (void)ok;
-    return CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX"))
+    OUString version
-           + " (" + arch + ")";
+        = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX"))
+          + " (" + arch + ")";
+
+#if HAVE_FEATURE_ODFSTUDIO
+    version += u" - ODFStudio"_ustr;
+#endif
+
+    return version;
+
+
+
 }
 
 OUString AboutDialog::GetBuildString()