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

[Caolán McNamara]

 cui/source/options/optgdlg.cxx |   11 +++++++++++
 cui/uiconfig/ui/optviewpage.ui |    2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 27b5c708938167e7516407db7d22bf48aac796b2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 9 09:36:16 2015 +0000

    Resolves: fdo#87876 full text of war and peace used as checkbox label
    
    Change-Id: I016975123c0f277b4e4c8c8097e89fd84d93530a
    (cherry picked from commit 081f3c0f70a9aa4d9f1f72bfbdb838bbd2dc993e)
    Reviewed-on: https://gerrit.libreoffice.org/14379
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 842e453..d1ac603 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -661,7 +661,18 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     get(m_pUseHardwareAccell, "useaccel");
     get(m_pUseAntiAliase, "useaa");
     get(m_pUseOpenGL, "useopengl");
+
     get(m_pForceOpenGL, "forceopengl");
+    //fdo#87876 , we need height-for-width support here, but for now we can
+    //bodge it
+    Size aPrefSize(m_pForceOpenGL->get_preferred_size());
+    Size aSize(m_pForceOpenGL->CalcMinimumSize(40*approximate_char_width()));
+    if (aPrefSize.Width() > aSize.Width())
+    {
+        m_pForceOpenGL->set_width_request(aSize.Width());
+        m_pForceOpenGL->set_height_request(aSize.Height());
+    }
+
     get(m_pMousePosLB, "mousepos");
     get(m_pMouseMiddleLB, "mousemiddle");
     // #i97672#
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 9536667..4ff3d61 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -97,7 +97,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="forceopengl">
+                      <object class="GtkCheckButton" id="forceopengl:wrap">
                         <property name="label" translatable="yes">Force OpenGL even if blacklisted (might expose driver bugs)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>