add some borders here

Change-Id: Ica1f2872759366120b9329f168f18788a8e239b3

3 files changed, 18 insertions, 39 deletions

diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index cb4997faa32d..b353853f54fe 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -193,8 +193,8 @@ TreeListBox::TreeListBox (Window* pParent, ResId const& rRes)
     Init();
 }
 
-TreeListBox::TreeListBox (Window* pParent)
-    : SvTreeListBox(pParent, WB_TABSTOP)
+TreeListBox::TreeListBox (Window* pParent, WinBits nStyle)
+    : SvTreeListBox(pParent, nStyle)
     , m_aNotifier( *this )
 {
     Init();
@@ -207,9 +207,13 @@ void TreeListBox::Init()
     nMode = 0xFF;   // everything
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTreeListBox(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTreeListBox(Window *pParent, VclBuilder::stringmap &rMap)
 {
-    return new TreeListBox(pParent);
+    WinBits nWinBits = WB_TABSTOP;
+    OString sBorder = VclBuilder::extractCustomProperty(rMap);
+    if (!sBorder.isEmpty())
+       nWinBits |= WB_BORDER;
+    return new TreeListBox(pParent, nWinBits);
 }
 
 TreeListBox::~TreeListBox ()
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 0484ea5b1852..90cc273e40dc 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -206,7 +206,7 @@ protected:
 
 public:
     TreeListBox(Window* pParent, const ResId& rRes);
-    TreeListBox(Window* pParent);
+    TreeListBox(Window* pParent, WinBits nStyle);
     ~TreeListBox();
 
     void            ScanEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index e1a92757d588..1dd72f9fe926 100644
--- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Jan  3 21:01:14 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
@@ -174,7 +175,7 @@
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="svtlo-SvTreeListBox" id="macros">
+                      <object class="svtlo-SvTreeListBox" id="macros:border">
                         <property name="width_request">280</property>
                         <property name="height_request">300</property>
                         <property name="visible">True</property>
@@ -188,40 +189,14 @@
                   </object>
                 </child>
                 <child type="label">
-                  <object class="GtkBox" id="box3">
+                  <object class="GtkLabel" id="existingmacrosft">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkLabel" id="existingmacrosft">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Existing macros in:</property>
-                        <property name="track_visited_links">False</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="macronameft1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="track_visited_links">False</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="label" translatable="yes">Existing macros in:</property>
+                    <property name="track_visited_links">False</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
@@ -245,7 +220,7 @@
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="basctllo-TreeListBox" id="libraries">
+                      <object class="basctllo-TreeListBox" id="libraries:border">
                         <property name="width_request">280</property>
                         <property name="height_request">300</property>
                         <property name="visible">True</property>