diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index aa1c88e4bcaf..b845a3e8e9e5 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -48,7 +48,7 @@ namespace dbaui virtual void dispose() override; virtual void GetFocus() override; - virtual void IdleResize() override; + virtual void Layout() override; OTableEditorCtrl* GetEditorCtrl() const { return m_xEditorCtrl.get(); } OTableFieldDescWin* GetDescWin() const { return m_xFieldDescWin.get(); } diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index ae32e9706302..bb2657f91a6f 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -72,7 +72,7 @@ void OTableBorderWindow::dispose() InterimItemWindow::dispose(); } -void OTableBorderWindow::IdleResize() +void OTableBorderWindow::Layout() { // dimensions of parent window auto nOutputHeight = GetSizePixel().Height(); @@ -88,7 +88,7 @@ void OTableBorderWindow::IdleResize() // set splitter m_xHorzSplitter->set_position(nSplitPos); - InterimItemWindow::IdleResize(); + InterimItemWindow::Layout(); if (nOldSplitPos != nSplitPos) m_xHorzSplitter->set_position(nSplitPos); diff --git a/include/vcl/InterimItemWindow.hxx b/include/vcl/InterimItemWindow.hxx index 6e406f41f67e..d6b47d33cade 100644 --- a/include/vcl/InterimItemWindow.hxx +++ b/include/vcl/InterimItemWindow.hxx @@ -45,7 +45,7 @@ protected: // returns true if keystroke is consumed bool ChildKeyInput(const KeyEvent& rKEvt); - virtual void IdleResize(); + virtual void Layout(); std::unique_ptr m_xBuilder; VclPtr m_xVclContentArea; @@ -57,7 +57,7 @@ private: void StartIdleLayout(); - DECL_LINK(DoResize, Timer*, void); + DECL_LINK(DoLayout, Timer*, void); virtual void ImplPaintToDevice(::OutputDevice* pTargetOutDev, const Point& rPos) override; }; diff --git a/vcl/source/control/InterimItemWindow.cxx b/vcl/source/control/InterimItemWindow.cxx index 86650fb9e8c1..132560247c74 100644 --- a/vcl/source/control/InterimItemWindow.cxx +++ b/vcl/source/control/InterimItemWindow.cxx @@ -17,7 +17,7 @@ InterimItemWindow::InterimItemWindow(vcl::Window* pParent, const OUString& rUIXM , m_pWidget(nullptr) // inheritors are expected to call InitControlBase { m_aLayoutIdle.SetPriority(TaskPriority::RESIZE); - m_aLayoutIdle.SetInvokeHandler(LINK(this, InterimItemWindow, DoResize)); + m_aLayoutIdle.SetInvokeHandler(LINK(this, InterimItemWindow, DoLayout)); m_aLayoutIdle.SetDebugName("InterimItemWindow m_aLayoutIdle"); m_xVclContentArea = VclPtr::Create(this); @@ -67,11 +67,11 @@ void InterimItemWindow::queue_resize(StateChangedType eReason) StartIdleLayout(); } -void InterimItemWindow::Resize() { StartIdleLayout(); } +void InterimItemWindow::Resize() { Layout(); } -IMPL_LINK_NOARG(InterimItemWindow, DoResize, Timer*, void) { IdleResize(); } +IMPL_LINK_NOARG(InterimItemWindow, DoLayout, Timer*, void) { Layout(); } -void InterimItemWindow::IdleResize() +void InterimItemWindow::Layout() { vcl::Window* pChild = GetWindow(GetWindowType::FirstChild); assert(pChild);