diff options
| author | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2020-07-21 08:17:05 +0200 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2020-07-21 15:35:20 +0200 |
| commit | b9c72c58e7d49882c9ca3ebf52bd8e36d0eed264 (patch) | |
| tree | 0518ac754ed732de75da8c3a67f160d5343e5f33 /cui | |
| parent | f533b6f9764e96be14aafe4ed125c8ed44a281bc (diff) | |
Revert "configure: add a --with-product-flavor switch"
This reverts commit c540483134482d437ea6e02390ff429f4300cbb0.
Reason for revert: https://blog.documentfoundation.org/blog/2020/07/20/update-on-marketing-and-communication-plans-for-the-libreoffice-7-x-series/
Conflicts:
icon-themes/colibre/brand/shell/logo_flavor.svg
(cherry picked from commit bb47ca165959f73929211a736aa8d810fe110e43)
Change-Id: Id9a2313d0bce496cb838e4eab448bea1722bc441
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99054
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/about.cxx | 9 | ||||
| -rw-r--r-- | cui/source/inc/about.hxx | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index c4e88e37dd73..53f05d52b2e1 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -32,8 +32,6 @@ #include <dialmgr.hxx> //CuiResId #include <i18nlangtag/languagetag.hxx> #include <sfx2/app.hxx> //SfxApplication::loadBrandSvg -#include <sfx2/sfxresid.hxx> -#include <sfx2/strings.hrc> #include <strings.hrc> #include <svtools/langhelp.hxx> #include <unotools/bootstrap.hxx> //utl::Bootstrap::getBuildVersion @@ -67,7 +65,6 @@ AboutDialog::AboutDialog(weld::Window *pParent) m_pUILabel(m_xBuilder->weld_label("lbUIString")), m_pLocaleLabel(m_xBuilder->weld_label("lbLocaleString")), m_pMiscLabel(m_xBuilder->weld_label("lbMiscString")), - m_pAboutLabel(m_xBuilder->weld_label("lbAbout")), m_pCopyrightLabel(m_xBuilder->weld_label("lbCopyright")) { // Labels @@ -90,12 +87,6 @@ AboutDialog::AboutDialog(weld::Window *pParent) m_pUILabel->set_label(Application::GetHWOSConfInfo(2)); m_pLocaleLabel->set_label(GetLocaleString()); m_pMiscLabel->set_label(GetMiscString()); - - if (std::string_view(PRODUCTFLAVOR) == "Personal") - { - m_pAboutLabel->set_label(SfxResId(STR_PERSONALDESC)); - } - m_pCopyrightLabel->set_label(GetCopyrightString()); // Images diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 37d1710a7f93..2262da38de96 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -40,7 +40,6 @@ private: std::unique_ptr<weld::Label> m_pUILabel; std::unique_ptr<weld::Label> m_pLocaleLabel; std::unique_ptr<weld::Label> m_pMiscLabel; - std::unique_ptr<weld::Label> m_pAboutLabel; std::unique_ptr<weld::Label> m_pCopyrightLabel; static OUString GetVersionString(); |