diff --git a/config_host/config_buildid.h.in b/config_host/config_buildid.h.in index d9663cb3f8f0..04f03b83543a 100644 --- a/config_host/config_buildid.h.in +++ b/config_host/config_buildid.h.in @@ -6,6 +6,5 @@ Optional Build ID displayed in the about dialog #define CONFIG_BUILDID_H #undef EXTRA_BUILDID -#undef PRODUCTFLAVOR #endif diff --git a/configure.ac b/configure.ac index 9e206cc303d0..be09b10a74a0 100644 --- a/configure.ac +++ b/configure.ac @@ -1509,11 +1509,6 @@ AC_ARG_WITH(product-name, [Define the product name. Default is AC_PACKAGE_NAME.]), ,with_product_name=$PRODUCTNAME) -AC_ARG_WITH(product-flavor, - AS_HELP_STRING([--with-product-flavor='My Own Personal Flavor'], - [Define the product flavor. Default is Personal.]), -,with_product_flavor=Personal) - 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.]), @@ -2386,15 +2381,6 @@ fi AC_SUBST(ENABLE_RELEASE_BUILD) AC_SUBST(GET_TASK_ALLOW_ENTITLEMENT) -AC_MSG_CHECKING([for product flavor]) -if test "$with_product_flavor" = "no"; then - PRODUCTFLAVOR="" -elif test -n "$with_product_flavor"; then - PRODUCTFLAVOR="$with_product_flavor" -fi -AC_MSG_RESULT([$PRODUCTFLAVOR]) -AC_DEFINE_UNQUOTED([PRODUCTFLAVOR], ["$PRODUCTFLAVOR"]) - dnl =================================================================== dnl Test whether to sign Windows Build dnl =================================================================== @@ -12921,7 +12907,7 @@ dnl =================================================================== AC_MSG_CHECKING([for alternative branding images directory]) # initialize mapped arrays BRAND_INTRO_IMAGES="intro.png intro-highres.png" -brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg logo_flavor.svg about.svg" +brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg about.svg" if test -z "$with_branding" -o "$with_branding" = "no"; then AC_MSG_RESULT([none]) 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 //CuiResId #include #include //SfxApplication::loadBrandSvg -#include -#include #include #include #include //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 m_pUILabel; std::unique_ptr m_pLocaleLabel; std::unique_ptr m_pMiscLabel; - std::unique_ptr m_pAboutLabel; std::unique_ptr m_pCopyrightLabel; static OUString GetVersionString(); diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index d02287da16b4..fba89ae42bfc 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include @@ -517,12 +516,6 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram // fdo#70376: We want the window title to contain just the // document name (from the above "component title"). impl_appendProductName (sTitle); - - if (!std::string_view(PRODUCTFLAVOR).empty()) - { - sTitle.append(" " PRODUCTFLAVOR); - } - impl_appendModuleName (sTitle); impl_appendDebugVersion (sTitle); #endif diff --git a/icon-themes/colibre/brand/intro-highres.png b/icon-themes/colibre/brand/intro-highres.png index 303190c9aab6..44fcca26a248 100644 Binary files a/icon-themes/colibre/brand/intro-highres.png and b/icon-themes/colibre/brand/intro-highres.png differ diff --git a/icon-themes/colibre/brand/intro.png b/icon-themes/colibre/brand/intro.png index d341eb2b4d38..9f394337441b 100644 Binary files a/icon-themes/colibre/brand/intro.png and b/icon-themes/colibre/brand/intro.png differ diff --git a/icon-themes/colibre/brand/shell/logo.svg b/icon-themes/colibre/brand/shell/logo.svg index eb438b99a19c..e7381d3f6614 100644 --- a/icon-themes/colibre/brand/shell/logo.svg +++ b/icon-themes/colibre/brand/shell/logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icon-themes/colibre/brand/shell/logo_flavor.svg b/icon-themes/colibre/brand/shell/logo_flavor.svg deleted file mode 100644 index 94feb26588bf..000000000000 --- a/icon-themes/colibre/brand/shell/logo_flavor.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/icon-themes/colibre/brand/shell/logo_inverted.svg b/icon-themes/colibre/brand/shell/logo_inverted.svg index 23ca88048e21..159a22a80d6c 100644 --- a/icon-themes/colibre/brand/shell/logo_inverted.svg +++ b/icon-themes/colibre/brand/shell/logo_inverted.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index 084d29466af7..f27cd4dae1d0 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc @@ -348,7 +348,6 @@ #define STR_CLICKHYPERLINK NC_("STR_CLICKHYPERLINK", "Click to open hyperlink: %{link}") #define STR_STYLEUSEDBY NC_("STR_STYLEUSEDBY", "(used by: %STYLELIST)") -#define STR_PERSONALDESC NC_("STR_PERSONALDESC", "The Personal edition is supported by volunteers and intended for individual use.") #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index d571b2131f3c..3b85a2e374e4 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -53,7 +53,6 @@ #include #include -#include using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -88,8 +87,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) : get(mpDBAllButton, "database_all"); get(mpMathAllButton, "math_all"); - get(mpBrandImage, "imBrand"); - get(mpHelpButton, "help"); //set an alternative help label that doesn't hotkey the H of the Help menu mpHelpButton->SetText(get("althelplabel")->GetText()); @@ -184,7 +181,6 @@ void BackingWindow::dispose() mpDrawAllButton.clear(); mpDBAllButton.clear(); mpMathAllButton.clear(); - mpBrandImage.clear(); mpHelpButton.clear(); mpExtensionsButton.clear(); mpAllButtonsBox.clear(); @@ -251,14 +247,6 @@ void BackingWindow::initControls() setupButton( mpDrawAllButton ); setupButton( mpCalcAllButton ); setupButton( mpDBAllButton ); - - BitmapEx aBitmap; - long nWidth = mpWriterAllButton->get_preferred_size().getWidth(); - if (SfxApplication::loadBrandSvg("shell/logo_flavor", aBitmap, nWidth)) - { - mpBrandImage->SetImage(Image(aBitmap)); - } - setupButton( mpImpressAllButton ); setupButton( mpMathAllButton ); diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index dc1a5be84146..15ab2fe0728f 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -66,7 +65,6 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer VclPtr mpDBAllButton; VclPtr mpMathAllButton; - VclPtr mpBrandImage; VclPtr mpHelpButton; VclPtr mpExtensionsButton; diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 9e309f397b94..9bfdac820e73 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -397,23 +397,6 @@ 14 - - - True - False - center - end - 24 - 24 - True - True - - - True - True - 15 - - False