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

Change-Id: If435d4c4c16fb1b52635fae2d966151970729daa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99053
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>

3 files changed, 0 insertions, 31 deletions

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 <com/sun/star/task/InteractionHandler.hpp>
 
 #include <officecfg/Office/Common.hxx>
-#include <sfx2/app.hxx>
 
 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<Window>("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 <vcl/builder.hxx>
 #include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
 
 #include <vcl/menubtn.hxx>
@@ -66,7 +65,6 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer
     VclPtr<PushButton> mpDBAllButton;
     VclPtr<PushButton> mpMathAllButton;
 
-    VclPtr<FixedImage> mpBrandImage;
     VclPtr<PushButton> mpHelpButton;
     VclPtr<PushButton> 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 @@
                             <property name="position">14</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkImage" id="imBrand">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">center</property>
-                            <property name="valign">end</property>
-                            <property name="margin_top">24</property>
-                            <property name="margin_bottom">24</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">15</property>
-                          </packing>
-                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>