diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2016-06-15 20:28:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-16 06:38:55 +0000 |
| commit | c0d9642b4df485c32350cdc7a16084a2eac2cbf7 (patch) | |
| tree | 018f32e05d2a3cac592f1b67af54511b007dc35e | |
| parent | fbed9850fd51327b9ca5971f603a06a49483ac14 (diff) | |
VCL: Simplify ToolBox initialisation
Change-Id: Ia83e2011897b8c6b81cbe476a22944abd2230291
Reviewed-on: https://gerrit.libreoffice.org/26329
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | vcl/source/window/menubarwindow.cxx | 9 | ||||
| -rw-r--r-- | vcl/source/window/menubarwindow.hxx | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 28a554ff8650..0ff19712f5c9 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 57127b1fbaac..069db1391a48 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 ); |