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

[Arnaud Versini]

 vcl/source/window/menubarwindow.cxx |    9 ++-------
 vcl/source/window/menubarwindow.hxx |    3 ---
 2 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit c0d9642b4df485c32350cdc7a16084a2eac2cbf7
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Wed Jun 15 20:28:09 2016 +0200

    VCL: Simplify ToolBox initialisation
    
    Change-Id: Ia83e2011897b8c6b81cbe476a22944abd2230291
    Reviewed-on: https://gerrit.libreoffice.org/26329
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 28a554f..0ff1971 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -35,14 +35,9 @@
 #define IID_DOCUMENTCLOSE 1
 
 DecoToolBox::DecoToolBox( vcl::Window* pParent ) :
-    ToolBox( pParent, 0 )
+    ToolBox( pParent, 0 ),
+    lastSize(-1)
 {
-    ImplInit();
-}
-
-void DecoToolBox::ImplInit()
-{
-    lastSize = -1;
     calcMinSize();
 }
 
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index 57127b1..069db13 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -39,13 +39,10 @@ class DecoToolBox : public ToolBox
     long lastSize;
     Size maMinSize;
 
-    using Window::ImplInit;
 public:
     explicit DecoToolBox(vcl::Window* pParent);
     virtual ~DecoToolBox() {}
 
-    void    ImplInit();
-
     void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     void    SetImages( long nMaxHeight = 0, bool bForce = false );