add borders to category and format listboxes

Change-Id: Ic53084ded75f9c9000d5768de12953e3b339908e

2 files changed, 19 insertions, 12 deletions

diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui
index 4633547865ed..338afb7e6f86 100644
--- a/cui/uiconfig/ui/numberingformatpage.ui
+++ b/cui/uiconfig/ui/numberingformatpage.ui
@@ -2,6 +2,11 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">20</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkGrid" id="NumberingFormatPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -309,7 +314,7 @@
                     <property name="vscrollbar_policy">always</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkTreeView" id="categorylb">
+                      <object class="GtkTreeView" id="categorylb:border">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="model">liststore1</property>
@@ -329,7 +334,7 @@
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">C_ategory</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">categorylb</property>
+                <property name="mnemonic_widget">categorylb:border</property>
                 <attributes>
                   <attribute name="weight" value="semibold"/>
                 </attributes>
@@ -367,11 +372,14 @@
                     <property name="vexpand">True</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <object class="svxlo-SvxFontListBox" id="formatlb">
+                      <object class="svxlo-SvxFontListBox" id="formatlb:border">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="Font List-selection1"/>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -405,7 +413,7 @@
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Fo_rmat</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">formatlb</property>
+                <property name="mnemonic_widget">formatlb:border</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -456,8 +464,8 @@
                       <object class="cuilo-SvxNumberPreview" id="preview">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
                         <property name="valign">end</property>
+                        <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
                       </object>
                       <packing>
@@ -517,11 +525,6 @@
       </packing>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">20</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 131ca43dc0d3..f5a4d32844fe 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -97,9 +97,13 @@ SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle)
     maEntryFont = maStdFont;
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontListBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontListBox(Window *pParent, VclBuilder::stringmap &rMap)
 {
-    return new SvxFontListBox(pParent, WB_TABSTOP);
+    WinBits nWinStyle = WB_TABSTOP;
+    OString sBorder = VclBuilder::extractCustomProperty(rMap);
+    if (!sBorder.isEmpty())
+        nWinStyle |= WB_BORDER;
+    return new SvxFontListBox(pParent, nWinStyle);
 }
 
 void SvxFontListBox::InsertFontEntry( const String& rString, const Font& rFont, const Color* pColor )