commit 5580974cea55fc4aceb139cc128d4e9a030fed5b
author Caolán McNamara <caolanm@redhat.com> Tue Jun 11 17:20:16 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Wed Jun 12 14:12:35 2019 +0200
tree 931c793697339e2f4af893a4be1381ccb812aef5
parent 8bafe19e22c496c79065a60622c9450b2222da1f

Resolves: tdf#125799 only let doc options grow/shrink

and give the global list of just 1 entry space for 2 to take the bare
look off it, if there end up with more entries here, then let it take
its natural size at that point

Change-Id: Ic1834dc90cdcc061636ad49d69c301c7b570db3e
Reviewed-on: https://gerrit.libreoffice.org/73832
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/source/ui/config/optcomp.cxx

diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index b00d6ed..fff81e5 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -115,6 +115,9 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxIt

    m_pGlobalOptionsCLB->SetStyle( m_pGlobalOptionsCLB->GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
    m_pGlobalOptionsCLB->SetHighlightRange();
    // tdf#125799, we let only the doc options grow/shrink but give this one more than its bare
    // min request height because there's only one row in it and that looks somewhat abrupt
    m_pGlobalOptionsCLB->set_height_request(m_pGlobalOptionsCLB->get_preferred_size().Height() * 2);

    InitControls( rSet );

sw/uiconfig/swriter/ui/optcompatpage.ui

diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index 1e2942b..abb693a 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -123,7 +123,7 @@
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="hexpand">True</property>
        <property name="vexpand">True</property>
        <property name="vexpand">False</property>
        <property name="label_xalign">0</property>
        <property name="shadow_type">none</property>
        <child>
@@ -131,7 +131,7 @@
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="hexpand">True</property>
            <property name="vexpand">True</property>
            <property name="vexpand">False</property>
            <property name="top_padding">6</property>
            <property name="left_padding">12</property>
            <child>
@@ -144,7 +144,7 @@
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="hexpand">True</property>
                    <property name="vexpand">True</property>
                    <property name="vexpand">False</property>
                    <child internal-child="selection">
                      <object class="GtkTreeSelection" id="Check List Box-selection1"/>
                    </child>