[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/window/builder.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit df2cb0625ba0952ef1013373df875d643ad989d5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 28 17:44:14 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 29 09:51:43 2018 +0100

    drop WB_SIMPLEMODE for TreeView
    
    multi selections are weird with this set
    
    Change-Id: I765c46294803d06911a6ac3fc37d68dd001aacdc
    Reviewed-on: https://gerrit.libreoffice.org/64192
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 3b04e1f7ed29..c76abc3a1f1f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1904,7 +1904,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
         //   everything over to SvHeaderTabListBox/SvTabListBox
         //c) remove the users of makeSvTabListBox and makeSvTreeListBox
         extractModel(id, rMap);
-        WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+        WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
         if (m_bLegacy)
         {
             OUString sBorder = BuilderUtils::extractCustomProperty(rMap);
@@ -1917,7 +1917,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
             nWinStyle |= WB_BORDER;
         if (m_bLegacy)
         {
-            xWindow = VclPtr<ListBox>::Create(pRealParent, nWinStyle);
+            xWindow = VclPtr<ListBox>::Create(pRealParent, nWinStyle | WB_SIMPLEMODE);
             xWindowForPackingProps = xWindow;
         }
         else