[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/page.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 6a3300fdf65b91350d2c8f63c57cab2c38c3c828
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 3 10:09:55 2018 +0100
Commit:     Maxim Monastirsky <momonasmon at gmail.com>
CommitDate: Wed Sep 5 00:35:37 2018 +0200

    Resolves: tdf#119574 set specific width for style list widget
    
    so super wide style name doesn't break things
    
    Change-Id: I096eb1d3deeb935b43566b4d3ccb45d89ac2a56a
    Reviewed-on: https://gerrit.libreoffice.org/59929
    Tested-by: Jenkins
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index df36ebf3a12d..054bc8fb16ed 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -183,6 +183,8 @@ SvxPageDescPage::SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rAttr)
     , m_xPrintRangeQueryText(m_xBuilder->weld_label("labelMsg"))
     , m_xBspWin(new weld::CustomWeld(*m_xBuilder, "drawingareaPageDirection", m_aBspWin))
 {
+    m_xRegisterLB->set_size_request(m_xRegisterLB->get_approximate_digit_width() * 20, -1);
+
     bBorderModified = false;
     m_aBspWin.EnableRTL(false);
 
@@ -1425,8 +1427,10 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList)
     OSL_ENSURE(!aList.empty(), "Empty string list");
 
     sStandardRegister = aList[0];
+    m_xRegisterLB->freeze();
     for (size_t i = 1; i < aList.size(); ++i)
         m_xRegisterLB->append_text(aList[i]);
+    m_xRegisterLB->thaw();
 
     m_xRegisterCB->show();
     m_xRegisterFT->show();