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

[Caolán McNamara]

 sfx2/source/dialog/mgetempl.cxx     |    5 +++++
 sfx2/uiconfig/ui/managestylepage.ui |   10 +++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 08c944c5b4b8a0b90a910d75af0ac664dd4fde62
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 17 12:44:14 2014 +0000

    Resolves: fdo#72233 too long style names over-stretch dialog
    
    Change-Id: Id6f102a3def1928ad8f6b4d27eb32f8c69bdba49
    (cherry picked from commit a95888e6e62a702f4b9af4a68c44339b51dc283e)
    Reviewed-on: https://gerrit.libreoffice.org/8086
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 5462100..cedbdc1 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -54,16 +54,21 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemS
 {
     get(m_pNameRo, "namero");
     get(m_pNameRw, "namerw");
+    m_pNameRo->set_width_request(m_pNameRw->get_preferred_size().Width());
     get(m_pAutoCB, "autoupdate");
     get(m_pFollowFt, "nextstyleft");
     get(m_pFollowLb, "nextstyle");
     m_pFollowLb->SetStyle(m_pFollowLb->GetStyle() | WB_SORT);
+    const sal_Int32 nMaxWidth(62);
+    m_pFollowLb->setMaxWidthChars(nMaxWidth);
     get(m_pBaseFt, "linkedwithft");
     get(m_pBaseLb, "linkedwith");
     m_pBaseLb->SetStyle(m_pBaseLb->GetStyle() | WB_SORT);
+    m_pBaseLb->setMaxWidthChars(nMaxWidth);
     get(m_pFilterFt, "categoryft");
     get(m_pFilterLb, "category");
     m_pFilterLb->SetStyle(m_pFilterLb->GetStyle() | WB_SORT);
+    m_pFilterLb->setMaxWidthChars(nMaxWidth);
     get(m_pDescFt, "desc");
 
     // this Page needs ExchangeSupport
diff --git a/sfx2/uiconfig/ui/managestylepage.ui b/sfx2/uiconfig/ui/managestylepage.ui
index 551f2d3..9bd0671 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkBox" id="ManageStylePage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -100,8 +101,6 @@
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="hexpand">True</property>
-                    <property name="entry_text_column">0</property>
-                    <property name="id_column">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -116,8 +115,6 @@
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="hexpand">True</property>
-                    <property name="entry_text_column">0</property>
-                    <property name="id_column">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -132,8 +129,6 @@
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
                     <property name="hexpand">True</property>
-                    <property name="entry_text_column">0</property>
-                    <property name="id_column">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -187,6 +182,7 @@
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
                         <property name="invisible_char">●</property>
+                        <property name="width_chars">52</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>