diff options
author | Heiko Tietze <tietze.heiko@gmail.com> | 2021-01-08 15:10:42 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-01-14 20:27:59 +0100 |
commit | bd319954e82da64d1ca037df2f32982af6ddb0e2 (patch) | |
tree | c3bdafdadaef7e0e82ad1126cc17389926532e45 /cui/source/dialogs/about.cxx | |
parent | Update git submodules (diff) | |
download | core-bd319954e82da64d1ca037df2f32982af6ddb0e2.tar.gz core-bd319954e82da64d1ca037df2f32982af6ddb0e2.zip |
Resolves tdf#139343 and tdf#139335 - Community/Enterprise flavor
* Switch CE/EE per --disable-community-flavor
internally use HAVE_FEATURE_COMMUNITY_FLAVOR
* Version info in about dialog shows text depending
on this flavor
* Start center also shows the brand image now
* TDF builds use a brand image with TDF tagline in
the about dialog
* Brand images with just "Community" (no Edition)
Change-Id: I363dd2b39df9aad951c9d79addf9bdedfc4a3495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108980
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 2d69acfde50cb0e06a9a057939078fd102d371a3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109274
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'cui/source/dialogs/about.cxx')
-rw-r--r-- | cui/source/dialogs/about.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 021e9e4c8856..d4e3d80de876 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -28,6 +28,7 @@ #include <unotools/resmgr.hxx> //Translate #include <config_buildid.h> //EXTRA_BUILDID +#include <config_features.h> #include <dialmgr.hxx> //CuiResId #include <i18nlangtag/languagetag.hxx> #include <sfx2/app.hxx> //SfxApplication::loadBrandSvg @@ -152,6 +153,11 @@ OUString AboutDialog::GetVersionString() { #elif defined(_WIN32) sVersion += " (x86)"; #endif + +#if HAVE_FEATURE_COMMUNITY_FLAVOR + sVersion += " / LibreOffice Community"; +#endif + return sVersion; } |