[Libreoffice-commits] core.git: cui/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Sep 23 12:11:52 UTC 2019


 cui/source/options/treeopt.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 49dd4ecaf846b31cd2e3cbc37c8790216d7e113f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 23 11:14:39 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 23 14:10:57 2019 +0200

    ofz#17613 fix build
    
    Change-Id: Ie8463af051b46dcd24b1642c583cc48f4359beea
    Reviewed-on: https://gerrit.libreoffice.org/79395
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 42bd20cac460..b9f78c6a261b 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -479,12 +479,10 @@ void OfaTreeOptionsDialog::InitWidgets()
     xBackPB = m_xBuilder->weld_button("revert");
     xTreeLB = m_xBuilder->weld_tree_view("pages");
     xTabBox = m_xBuilder->weld_container("box");
-    Size aSize(xTreeLB->get_approximate_digit_width() * 82, xTreeLB->get_height_rows(32));
+    Size aSize(xTreeLB->get_approximate_digit_width() * 82, xTreeLB->get_height_rows(30));
 #if HAVE_FEATURE_GPGME
     // tdf#115015: make enough space for crypto settings (approx. 14 text edits + padding)
     aSize.setHeight((Edit::GetMinimumEditSize().Height() + 6) * 14);
-#else
-    aSize.setHeight(aSize.Height() - get_action_area()->get_preferred_size().Height());
 #endif
     xTabBox->set_size_request(aSize.Width(), aSize.Height());
     xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 30, aSize.Height());


More information about the Libreoffice-commits mailing list