[Libreoffice-commits] core.git: vcl/workben

[Miklos Vajna]

 vcl/workben/vcldemo.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c1f456a4d212f6108220bb7c9712d584053c1e1e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Aug 14 17:29:46 2015 +0200

    vcldemo: fix --widgets crash-on-exit
    
    Window ( 7VclVBox()) with live children destroyed:  7ToolBox() 10PushButton(Click me; go on)
    
    Change-Id: I7b95198e24ea4d6ab085705096421219b3e16904

diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index a785ab9..33cb4f4 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1460,7 +1460,7 @@ class DemoWidgets : public WorkWindow
 
 public:
     DemoWidgets() :
-        WorkWindow(NULL, WB_STDWORK),
+        WorkWindow(NULL, WB_APP | WB_STDWORK),
         mpBox(VclPtrInstance<VclVBox>(this, false, 3)),
         mpToolbox(VclPtrInstance<ToolBox>(mpBox.get())),
         mpButton(VclPtrInstance<PushButton>(mpBox.get()))
@@ -1489,9 +1489,9 @@ public:
     virtual ~DemoWidgets() { disposeOnce(); }
     virtual void dispose() SAL_OVERRIDE
     {
-        mpBox.disposeAndClear();
         mpToolbox.disposeAndClear();
         mpButton.disposeAndClear();
+        mpBox.disposeAndClear();
         WorkWindow::dispose();
     }
     virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE