include/vcl/syswin.hxx | 1 - vcl/source/window/syswin.cxx | 36 ++++++++++++++---------------------- 2 files changed, 14 insertions(+), 23 deletions(-)
New commits: commit 9c4d92c93976a390a98b61c34b24ba78d5640772 Author: Arnaud Versini <[email protected]> Date: Mon Jun 27 19:21:07 2016 +0200 VCL : Simplify SystemWindow initialisation Change-Id: I9a899cddd8effc1c5deef5db9124b21e9e958392 Reviewed-on: https://gerrit.libreoffice.org/26727 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index cbd2a9c..4c525e7 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 80523b4..bdf2e44 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) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
