vcl/source/window/builder.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 07d78b38fb9f62d533bf76f9d061134dc862438c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 30 10:40:13 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 30 21:05:28 2019 +0100
honour closeable flag
Change-Id: I4b37d6698d3ebd6449c5ba797784b49cc7b2cada
Reviewed-on: https://gerrit.libreoffice.org/81757
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 67f96160165b..1823601b5331 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1748,9 +1748,11 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window
*pParent, const OString &
// WB_ALLOWMENUBAR because we don't know in advance if we will
encounter
// a menubar, and menubars need a BorderWindow in the toplevel, and
// such border windows need to be in created during the dialog ctor
- WinBits nBits = WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE|WB_ALLOWMENUBAR;
+ WinBits nBits = WB_MOVEABLE|WB_3DLOOK|WB_ALLOWMENUBAR;
if (extractResizable(rMap))
nBits |= WB_SIZEABLE;
+ if (extractCloseable(rMap))
+ nBits |= WB_CLOSEABLE;
Dialog::InitFlag eInit = !pParent ? Dialog::InitFlag::NoParent :
Dialog::InitFlag::Default;
if (name == "GtkAssistant")
xWindow = VclPtr<vcl::RoadmapWizard>::Create(pParent, nBits,
eInit);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
