diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2016-06-27 19:21:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-28 06:34:15 +0000 |
| commit | 9c4d92c93976a390a98b61c34b24ba78d5640772 (patch) | |
| tree | ff59531634f2adac4fd793302ad7d50cdac34f60 | |
| parent | 41bc79521eadb0c39b8f208ba6fe32b82ef1ed42 (diff) | |
VCL : Simplify SystemWindow initialisation
Change-Id: I9a899cddd8effc1c5deef5db9124b21e9e958392
Reviewed-on: https://gerrit.libreoffice.org/26727
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | include/vcl/syswin.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/syswin.cxx | 36 |
2 files changed, 14 insertions, 23 deletions
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index cbd2a9c2f010..4c525e72484f 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -177,7 +177,6 @@ public: SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; } private: - SAL_DLLPRIVATE void Init(); SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin ); virtual void setPosSizeOnContainee(Size aSize, Window &rBox); DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void ); diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 80523b4a67e4..bdf2e44a6ffd 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -65,37 +65,29 @@ SystemWindow::ImplData::~ImplData() delete mpTaskPaneList; } -void SystemWindow::Init() +SystemWindow::SystemWindow(WindowType nType) + : Window(nType) + , mbPinned(false) + , mbRollUp(false) + , mbRollFunc(false) + , mbDockBtn(false) + , mbHideBtn(false) + , mbSysChild(false) + , mbIsCalculatingInitialLayoutSize(false) + , mbInitialLayoutDone(false) + , mnMenuBarMode(MenuBarMode::Normal) + , mnIcon(0) + , mpImplData(new ImplData) + , mbIsDefferedInit(false) { - mpImplData = new ImplData; mpWindowImpl->mbSysWin = true; mpWindowImpl->mnActivateMode = ActivateModeFlags::GrabFocus; - mpMenuBar = nullptr; - mbPinned = false; - mbRollUp = false; - mbRollFunc = false; - mbDockBtn = false; - mbHideBtn = false; - mbSysChild = false; - mbIsCalculatingInitialLayoutSize = false; - mbInitialLayoutDone = false; - mnMenuBarMode = MenuBarMode::Normal; - mnIcon = 0; - mpDialogParent = nullptr; - //To-Do, reuse maResizeTimer maLayoutIdle.SetPriority(SchedulerPriority::RESIZE); maLayoutIdle.SetIdleHdl( LINK( this, SystemWindow, ImplHandleLayoutTimerHdl ) ); } -SystemWindow::SystemWindow(WindowType nType) - : Window(nType) - , mbIsDefferedInit(false) -{ - Init(); -} - void SystemWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) { |