get misc. ordering right and add missing disposes.

Change-Id: I76489f833949a556b657010e5d5cba6f64c89ba7

vcl/source/window/menubarwindow.cxx

@@ -81,6 +81,8 @@ void DecoToolBox::calcMinSize()
     }
     aTbx->SetOutStyle( TOOLBOX_STYLE_FLAT );
     maMinSize = aTbx->CalcWindowSizePixel();
+
+    aTbx.disposeAndClear();
 }
 
 void DecoToolBox::SetImages( long nMaxHeight, bool bForce )
@@ -173,9 +175,9 @@ void MenuBarWindow::dispose()
     aCloseBtn->RemoveEventListener(LINK(this, MenuBarWindow, ToolboxEventHdl));
     RemoveEventListener(LINK(this, MenuBarWindow, ShowHideListener));
 
-    aCloseBtn.disposeAndClear();
-    aFloatBtn.disposeAndClear();
     aHideBtn.disposeAndClear();
+    aFloatBtn.disposeAndClear();
+    aCloseBtn.disposeAndClear();
 
     Window::dispose();
 }

vcl/source/window/menubarwindow.hxx

@@ -39,7 +39,9 @@ class DecoToolBox : public ToolBox
 
     using Window::ImplInit;
 public:
-            DecoToolBox( vcl::Window* pParent, WinBits nStyle = 0 );
+             DecoToolBox( vcl::Window* pParent, WinBits nStyle = 0 );
+    virtual ~DecoToolBox() {}
+
     void    ImplInit();
 
     void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;

vcl/source/window/toolbox2.cxx

@@ -165,6 +165,7 @@ ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) :
 
 ImplToolItem::~ImplToolItem()
 {
+    mpWindow.disposeAndClear();
 }
 
 ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem )