[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - sfx2/source sw/uiconfig

[Szymon KÅ‚os (via logerrit)]

 sfx2/source/notebookbar/PriorityMergedHBox.cxx |    2 -
 sw/uiconfig/swriter/ui/notebookbar.ui          |   39 -------------------------
 2 files changed, 41 deletions(-)

New commits:
commit fe92c8827b418481fcf504e171c4bd57cbd3acd0
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jun 26 13:31:55 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jun 26 14:07:52 2020 +0200

    notebookbar: don't overwrite popup height
    
    Change-Id: I41e0bab8f44b1d7be627e3a7e0f3293179f3977c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97215
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sfx2/source/notebookbar/PriorityMergedHBox.cxx b/sfx2/source/notebookbar/PriorityMergedHBox.cxx
index 328241ae67d8..982b511509ee 100644
--- a/sfx2/source/notebookbar/PriorityMergedHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityMergedHBox.cxx
@@ -97,8 +97,6 @@ IMPL_LINK(PriorityMergedHBox, PBClickHdl, Button*, /*pButton*/, void)
 
     m_pPopup->hideSeparators(true);
 
-    m_pPopup->getBox()->set_height_request(GetSizePixel().Height());
-
     long x = m_pButton->GetPosPixel().getX();
     long y = m_pButton->GetPosPixel().getY() + GetSizePixel().Height();
     tools::Rectangle aRect(x, y, x, y);
commit 133d8a1e6e85722cae5077644a3c1474ccd741fd
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jun 26 13:21:30 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jun 26 14:07:41 2020 +0200

    notebookbar: remove button which doesn't fit
    
    Change-Id: I904ac23f6555dae1ed316a274ac2856c9c3b50f7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97214
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 152d8d6aa074..10910bc421aa 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -4118,45 +4118,6 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkBox" id="GroupB17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="sfxlo-NotebookbarToolBox" id="SectionBottom5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="show_arrow">False</property>
-                                <child>
-                                  <object class="GtkToolButton" id="Home-DesignerDialog">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="halign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="action_name">.uno:DesignerDialog</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="homogeneous">True</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
                         <style>
                           <class name="priority-5"/>
                         </style>