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

[Libreoffice Gerrit user]

 sfx2/source/dialog/mgetempl.cxx |    1 +
 sw/source/ui/chrdlg/chardlg.cxx |    5 +++++
 2 files changed, 6 insertions(+)

New commits:
commit 8b6f1d8460b931950b98b5968ff7734f3c128a4d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 25 12:11:41 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Sat Oct 27 18:10:26 2018 +0200

    tdf#120188 limit the width of the styles combos in the url tabpage
    
    Change-Id: Idcc4043b70c30ccc693c9c5ac983bfabe0573862
    Reviewed-on: https://gerrit.libreoffice.org/62353
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index c3c249ada7df..b306b477dc93 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -70,6 +70,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(TabPageParent pParent, const Sf
 {
     m_xNameRo->set_size_request(m_xNameRw->get_preferred_size().Width(), -1);
     m_xFollowLb->make_sorted();
+    // tdf#120188 like SwCharURLPage limit the width of the style combos
     const int nMaxWidth(m_xFollowLb->get_approximate_digit_width() * 50);
     m_xFollowLb->set_size_request(nMaxWidth , -1);
     m_xBaseLb->make_sorted();
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index c7a7e84a413c..0785ccbf3457 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -147,6 +147,11 @@ SwCharURLPage::SwCharURLPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
     , m_xNotVisitedLB(m_xBuilder->weld_combo_box_text("unvisitedlb"))
     , m_xCharStyleContainer(m_xBuilder->weld_widget("charstyle"))
 {
+    // tdf#120188 like SfxManageStyleSheetPage limit the width of the style combos
+    const int nMaxWidth(m_xVisitedLB->get_approximate_digit_width() * 50);
+    m_xVisitedLB->set_size_request(nMaxWidth , -1);
+    m_xNotVisitedLB->set_size_request(nMaxWidth , -1);
+
     const SfxPoolItem* pItem;
     SfxObjectShell* pShell;
     if(SfxItemState::SET == rCoreSet.GetItemState(SID_HTML_MODE, false, &pItem) ||