config_host/config_features.h.in | 5 ----- configure.ac | 13 ------------- cui/source/dialogs/about.cxx | 8 +------- distro-configs/CPLinux-LOKit.conf | 1 - filter/source/pdf/pdfexport.cxx | 3 --- 5 files changed, 1 insertion(+), 29 deletions(-)
New commits: commit 79ecb59897a8ce804d347b00b2b5a36d212e6ff6 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Dec 5 17:50:41 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Dec 12 16:20:08 2025 +0100 related tdf#169841: drop community-flavor switch Added in commit 2d69acfde50cb0e06a9a057939078fd102d371a3 Author: Heiko Tietze <[email protected]> Date: Fri Jan 8 15:10:42 2021 +0100 Resolves tdf#139343 and tdf#139335 - Community/Enterprise flavor it only adds "LibreOffice Community" to the version string in the about dialog, which is not really useful at this point, since final releases don't use it either Change-Id: Ifdd7a91cdd18a016c104aea871fb7dc9c42fa97a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195106 Tested-by: Xisco Fauli <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 89683940220f7f8eb67f4b0aabc23df422db9822) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195529 diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in index 453594095017..8d888064c53d 100644 --- a/config_host/config_features.h.in +++ b/config_host/config_features.h.in @@ -132,11 +132,6 @@ */ #define HAVE_FEATURE_ANDROID_LOK 0 -/* - * Whether this is a Community Edition. - */ -#define HAVE_FEATURE_COMMUNITY_FLAVOR 0 - /* XMLHELP - whether we include the XML help mechanisms * * Can be turned off with --without-xmlhelp diff --git a/configure.ac b/configure.ac index c1baba596656..f63ee0a2473b 100644 --- a/configure.ac +++ b/configure.ac @@ -2155,11 +2155,6 @@ AC_ARG_WITH(product-name, [Define the product name. Default is AC_PACKAGE_NAME.]), ,with_product_name=$PRODUCTNAME) -libo_FUZZ_ARG_ENABLE(community-flavor, - AS_HELP_STRING([--disable-community-flavor], - [Disable the Community branding.]), -,) - AC_ARG_WITH(package-version, AS_HELP_STRING([--with-package-version='3.1.4.5'], [Define the package version. Default is AC_PACKAGE_VERSION. Use only if you distribute an own build for macOS.]), @@ -3243,14 +3238,6 @@ else fi AC_SUBST(ENABLE_HARDENING_FLAGS) -AC_MSG_CHECKING([whether to build a Community flavor]) -if test -z "$enable_community_flavor" -o "$enable_community_flavor" = "yes"; then - AC_DEFINE(HAVE_FEATURE_COMMUNITY_FLAVOR) - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi - dnl =================================================================== dnl Test whether to sign Windows Build dnl =================================================================== diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index f760d37d8468..2484940a92ed 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -149,13 +149,7 @@ OUString AboutDialog::GetVersionString() { OUString arch; auto const ok = rtl::Bootstrap::get(u"_ARCH"_ustr, arch); assert(ok); (void) ok; - OUString sVersion = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")"; - -#if HAVE_FEATURE_COMMUNITY_FLAVOR - sVersion += " / LibreOffice Community"; -#endif - - return sVersion; + return CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")"; } OUString AboutDialog::GetBuildString() diff --git a/distro-configs/CPLinux-LOKit.conf b/distro-configs/CPLinux-LOKit.conf index 321cb967b217..643c16a36460 100644 --- a/distro-configs/CPLinux-LOKit.conf +++ b/distro-configs/CPLinux-LOKit.conf @@ -1,7 +1,6 @@ --enable-hardening-flags --enable-mpl-subset --with-vendor=Collabora ---disable-community-flavor #--with-branding=icon-themes/galaxy/brand_cp --with-system-dicts --with-myspell-dicts diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index f1b047576f4b..c70cb599cbe6 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -521,9 +521,6 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& " " + utl::ConfigManager::getAboutBoxProductVersion() + " (" + arch + ")" -#if HAVE_FEATURE_COMMUNITY_FLAVOR - " / LibreOffice Community" -#endif ; }
