summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-17 12:44:14 +0000
committerKohei Yoshida <libreoffice@kohei.us>2014-02-17 18:07:14 +0000
commitbf2d7f598be36fc3804392403c7d09405f94cff8 (patch)
tree3867d971125beacc16ed514a184ddebd866507fb
parent4b0ce4aa1d87c9f65fd7d46be53eef5a5669b88f (diff)
Resolves: fdo#72233 too long style names over-stretch dialog
Change-Id: Id6f102a3def1928ad8f6b4d27eb32f8c69bdba49 (cherry picked from commit a95888e6e62a702f4b9af4a68c44339b51dc283e) Reviewed-on: https://gerrit.libreoffice.org/8085 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
-rw-r--r--sfx2/source/dialog/mgetempl.cxx5
-rw-r--r--sfx2/uiconfig/ui/managestylepage.ui10
2 files changed, 8 insertions, 7 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 0d6755d970af..932fddd09815 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 551f2d37d32d..9bd0671190b7 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>