diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-13 16:31:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-14 09:57:16 +0100 |
| commit | 3b081e66052e173ca04b4d9c0a6b2054aeb70d4c (patch) | |
| tree | fb0862b7135b34447a276ca89f2e505345994a1e | |
| parent | 91cc66dfa77cb0130d0bc99875275f7267b7f95a (diff) | |
drop need to include vcl/edit.hxx in cui
Change-Id: I9479a7e8fc5b3897e48efc47dbae979137718bc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88618
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/options/treeopt.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 19e6be3849ff..59c73e393739 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -97,7 +97,6 @@ #include <unotools/moduleoptions.hxx> #include <unotools/optionsdlg.hxx> #include <unotools/viewoptions.hxx> -#include <vcl/edit.hxx> #include <vcl/help.hxx> #include <vcl/svapp.hxx> #include <sal/log.hxx> @@ -482,8 +481,13 @@ void OfaTreeOptionsDialog::InitWidgets() xTabBox = m_xBuilder->weld_container("box"); 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); + { + // load this little .ui just to measure the height of an Entry + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xDialog.get(), "cui/ui/namedialog.ui")); + std::unique_ptr<weld::Entry> xEntry(xBuilder->weld_entry("name_entry")); + // tdf#115015: make enough space for crypto settings (approx. 14 text edits + padding) + aSize.setHeight((xEntry->get_preferred_size().Height() + 6) * 14); + } #endif xTabBox->set_size_request(aSize.Width(), aSize.Height()); xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 30, aSize.Height()); |