[Libreoffice-commits] core.git: sc/source sc/uiconfig

[Caolán McNamara]

 sc/source/ui/dbgui/validate.cxx           |    4 ++++
 sc/uiconfig/scalc/ui/erroralerttabpage.ui |    6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit fc2ca4e8404122aa7d893f6b3d169345fb95a673
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 19 12:21:19 2013 +0100

    set some default widths/heights for validate multiline edit boxes
    
    Change-Id: Ide59f0fa382c148abeac2b3dde17cc913183391d

diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 07c3c19..45e3694 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -692,6 +692,8 @@ ScTPValidationHelp::ScTPValidationHelp( Window*         pParent,
     get(pTsbHelp,"tsbhelp");
     get(pEdtTitle,"title");
     get(pEdInputHelp,"inputhelp");
+    pEdInputHelp->set_height_request(pEdInputHelp->GetTextHeight() * 12);
+    pEdInputHelp->set_width_request(pEdInputHelp->approximate_char_width() * 50);
     Init();
 }
 
@@ -773,6 +775,8 @@ ScTPValidationError::ScTPValidationError( Window*           pParent,
     get(m_pEdtTitle,"title");
     get(m_pFtError,"errormsg_label");
     get(m_pEdError,"errorMsg");
+    m_pEdError->set_height_request(m_pEdError->GetTextHeight() * 12);
+    m_pEdError->set_width_request(m_pEdError->approximate_char_width() * 50);
     Init();
 }
 
diff --git a/sc/uiconfig/scalc/ui/erroralerttabpage.ui b/sc/uiconfig/scalc/ui/erroralerttabpage.ui
index ec11e31..40a20be 100644
--- a/sc/uiconfig/scalc/ui/erroralerttabpage.ui
+++ b/sc/uiconfig/scalc/ui/erroralerttabpage.ui
@@ -16,7 +16,6 @@
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="hexpand">True</property>
-        <property name="use_action_appearance">False</property>
         <property name="use_underline">True</property>
         <property name="xalign">0</property>
         <property name="inconsistent">True</property>
@@ -89,7 +88,6 @@
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="vscrollbar_policy">always</property>
                     <property name="shadow_type">in</property>
@@ -97,7 +95,6 @@
                       <object class="GtkTextView" id="errorMsg:border">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
                       </object>
                     </child>
@@ -113,7 +110,6 @@
                   <object class="GtkEntry" id="title">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
                     <property name="invisible_char">●</property>
                     <property name="invisible_char_set">True</property>
                   </object>
@@ -147,7 +143,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -161,6 +156,7 @@
                   <object class="GtkComboBoxText" id="actionCB">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
                     <items>
                       <item translatable="yes">Stop</item>
                       <item translatable="yes">Warning</item>