summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-18 16:12:23 +0100
committerEike Rathke <erack@redhat.com>2016-07-19 19:26:34 +0000
commitf5e0651798c711905bdb9b2023c7672fea400ad1 (patch)
tree210811aa7c3aa950d4c539e49438dda39c8cf39d
parentebddfbaeb71383ae94ff491da0b307c86c35e447 (diff)
Resolves: tdf#99963 line wrap very long checkbox content
Change-Id: I11ab52b8c6600d5d479ac3d4d2cd78d1957d8676 (cherry picked from commit ea3f74ba0a9d291f26a79f2568d59f1a030d0585) Reviewed-on: https://gerrit.libreoffice.org/27293 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Eike Rathke <erack@redhat.com>
-rw-r--r--cui/source/tabpages/border.cxx10
-rw-r--r--cui/uiconfig/ui/borderpage.ui2
2 files changed, 11 insertions, 1 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index c999db8486c3..10e030249647 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -137,6 +137,16 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
get(m_pMergeAdjacentBordersCB, "mergeadjacent");
get(m_pRemoveAdjcentCellBordersCB, "rmadjcellborders");
+ //tdf#99963, we need height-for-width support here, but for now we can
+ //bodge it
+ Size aPrefSize(m_pRemoveAdjcentCellBordersCB->get_preferred_size());
+ Size aSize(m_pRemoveAdjcentCellBordersCB->CalcMinimumSize(36*approximate_char_width()));
+ if (aPrefSize.Width() > aSize.Width())
+ {
+ m_pRemoveAdjcentCellBordersCB->set_width_request(aSize.Width());
+ m_pRemoveAdjcentCellBordersCB->set_height_request(aSize.Height());
+ }
+
if ( GetDPIScaleFactor() > 1 )
{
for (short i = 0; i < aBorderImgLst.GetImageCount(); i++)
diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index d25dbedfd65b..20fe9418fd49 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -103,7 +103,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="rmadjcellborders">
+ <object class="GtkCheckButton" id="rmadjcellborders:wrap">
<property name="label" translatable="yes">Remove border from adjacent cells as well</property>
<property name="visible">True</property>
<property name="can_focus">True</property>