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

[Arnaud Versini]

 include/vcl/split.hxx       |    1 -
 vcl/source/window/split.cxx |   26 +++++++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

New commits:
commit e4adc7ff5d45833ca3da9dae156dc66e50b9f088
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Sun Jun 12 14:36:11 2016 +0200

    VCL: Simplify Splitter initialisation
    
    Change-Id: I95e42012d8503493a89aee94fd05b2a878535f06
    Reviewed-on: https://gerrit.libreoffice.org/26198
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index a80304e..8557d77 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -43,7 +43,6 @@ private:
     Link<Splitter*,void>   maSplitHdl;
     Link<Splitter*,void>   maEndSplitHdl;
 
-    SAL_DLLPRIVATE void      ImplInitSplitterData();
     SAL_DLLPRIVATE void      ImplDrawSplitter();
     SAL_DLLPRIVATE void      ImplSplitMousePos( Point& rPos );
     SAL_DLLPRIVATE void      ImplStartKbdSplitting();
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index d2590ca..31c7bbd 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -49,19 +49,6 @@ namespace
     };
 }
 
-void Splitter::ImplInitSplitterData()
-{
-    ImplGetWindowImpl()->mbSplitter        = true;
-    mpRefWin          = nullptr;
-    mnSplitPos        = 0;
-    mnLastSplitPos    = 0;
-    mnStartSplitPos   = 0;
-    mbDragFull        = false;
-    mbKbdSplitting    = false;
-    mbInKeyEvent      = 0;
-    mnKeyboardStepSize = SPLITTER_DEFAULTSTEPSIZE;
-}
-
 // Should only be called from a ImplInit method for initialization or
 // after checking bNew is different from the current mbHorzSplit value.
 // The public method that does that check is Splitter::SetHorizontal().
@@ -140,9 +127,18 @@ void Splitter::ImplDrawSplitter()
 }
 
 Splitter::Splitter( vcl::Window* pParent, WinBits nStyle ) :
-    Window( WINDOW_SPLITTER )
+    Window( WINDOW_SPLITTER ),
+    mpRefWin( nullptr ),
+    mnSplitPos( 0 ),
+    mnLastSplitPos( 0 ),
+    mnStartSplitPos( 0 ),
+    mbDragFull( false ),
+    mbKbdSplitting( false ),
+    mbInKeyEvent( 0 ),
+    mnKeyboardStepSize( SPLITTER_DEFAULTSTEPSIZE )
 {
-    ImplInitSplitterData();
+    ImplGetWindowImpl()->mbSplitter        = true;
+
     ImplInit( pParent, nStyle );
 
     SetLineColor();