[Libreoffice-commits] core.git: cui/source

[Caolán McNamara]

 cui/source/customize/acccfg.cxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 859204a52351c4d5d146e8b22d14bd4a44f294e9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 4 11:40:25 2016 +0000

    customize dialog crashes, since...
    
    commit 164d8e3b1aa660d65c1af9570e67b66520bd953a
    Date:   Thu Nov 3 02:35:00 2016 +0200
    
        tdf#91222 VclBuilder constructor cleanup
    
    so revert problematic bit of that.
    
    The impl is called SfxAccCfgTabListBox_Impl, but the
    widget name is SfxAccCfgTabListBox
    
    Change-Id: I8e800b376afa48090fde1074350c1c8ce39a27bf

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 1c98ae8..ae7d1cc 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -664,7 +664,16 @@ void SfxAccCfgLBoxString_Impl::Paint(const Point& aPos, SvTreeListBox& /*rDevice
 
 }
 
-VCL_BUILDER_FACTORY_CONSTRUCTOR(SfxAccCfgTabListBox_Impl, WB_TABSTOP)
+VCL_BUILDER_DECL_FACTORY(SfxAccCfgTabListBox)
+{
+    WinBits nWinBits = WB_TABSTOP;
+
+    OString sBorder = VclBuilder::extractCustomProperty(rMap);
+    if (!sBorder.isEmpty())
+       nWinBits |= WB_BORDER;
+
+    rRet = VclPtr<SfxAccCfgTabListBox_Impl>::Create(pParent, nWinBits);
+}
 
 SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl()
 {