summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-25 12:11:41 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-10-25 15:27:37 +0200
commite19b342f15178ce9f7d7b832649ee173b4b7f2ea (patch)
tree779950820d9fc95262a737e9da96224763e74a60
parent88014e265a91753b69b70b5f4b246921d16051de (diff)
tdf#120188 limit the width of the styles combos in the url tabpage
Change-Id: Idcc4043b70c30ccc693c9c5ac983bfabe0573862 Reviewed-on: https://gerrit.libreoffice.org/62352 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sfx2/source/dialog/mgetempl.cxx1
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx5
2 files changed, 6 insertions, 0 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 7557fead6834..ebebe1c78bd5 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -68,6 +68,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(TabPageParent pParent, const Sf
, m_xNameFt(m_xBuilder->weld_label("nameft"))
{
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 b83104256817..8b5177ebc166 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -148,6 +148,11 @@ SwCharURLPage::SwCharURLPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
, m_xNotVisitedLB(m_xBuilder->weld_combo_box("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) ||