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 @@ + @@ -174,7 +175,7 @@ 6 12 - + 280 300 True @@ -188,40 +189,14 @@ - + True False - - - True - False - Existing macros in: - False - - - - - - False - True - 0 - - - - - True - False - False - - - - - - False - True - 1 - - + Existing macros in: + False + + + @@ -245,7 +220,7 @@ 6 12 - + 280 300 True