[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-0' - cui/source cui/uiconfig

[Caolán McNamara]

 cui/source/tabpages/border.cxx |   10 ++++++++++
 cui/uiconfig/ui/borderpage.ui  |    2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit f5e0651798c711905bdb9b2023c7672fea400ad1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 18 16:12:23 2016 +0100

    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 at ubuntu.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index c999db8..10e0302 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 d25dbed..20fe941 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>