summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Versini <arnaud.versini@gmail.com>2016-06-12 14:36:11 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-13 08:01:42 +0000
commite4adc7ff5d45833ca3da9dae156dc66e50b9f088 (patch)
tree6ea0b4d60b4d36e1f707bdff96a3b6115a44d103
parent90371480b5e8eab4f79a43faa216dec42ddafbb4 (diff)
VCL: Simplify Splitter initialisation
Change-Id: I95e42012d8503493a89aee94fd05b2a878535f06 Reviewed-on: https://gerrit.libreoffice.org/26198 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r--include/vcl/split.hxx1
-rw-r--r--vcl/source/window/split.cxx26
2 files changed, 11 insertions, 16 deletions
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index a80304e3fdac..8557d77ac5c0 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 d2590cacd6c8..31c7bbd04878 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();