diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-22 11:15:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-22 15:13:19 +0100 |
| commit | 8f4da40cc69979ba4982d44c49035138d13726d8 (patch) | |
| tree | af625c320dbd8900fb1c21c43d62ad6f02c8445b /vcl/source | |
| parent | 09acea893429b6bdfe61da23e463cfbc29947b72 (diff) | |
rename to DropdownDockingWindow
these are used as non-resizable dropdown menu-alike things
Change-Id: Ifd2ebd98a5fb08d27345113f4be8db0afb1d895a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111310
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/control/calendar.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index e35dc353d442..efcfc0c63800 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -1546,7 +1546,7 @@ namespace }; } -struct ImplCFieldFloatWin : public InterimDockingWindow +struct ImplCFieldFloatWin : public DropdownDockingWindow { explicit ImplCFieldFloatWin(vcl::Window* pParent); virtual void dispose() override; @@ -1557,7 +1557,7 @@ struct ImplCFieldFloatWin : public InterimDockingWindow }; ImplCFieldFloatWin::ImplCFieldFloatWin(vcl::Window* pParent) - : InterimDockingWindow(pParent) + : DropdownDockingWindow(pParent) { setDeferredProperties(); mxWidget.reset(new ImplCFieldFloat(m_xBox.get())); @@ -1571,12 +1571,12 @@ ImplCFieldFloatWin::~ImplCFieldFloatWin() void ImplCFieldFloatWin::dispose() { mxWidget.reset(); - InterimDockingWindow::dispose(); + DropdownDockingWindow::dispose(); } void ImplCFieldFloatWin::GetFocus() { - InterimDockingWindow::GetFocus(); + DropdownDockingWindow::GetFocus(); if (!mxWidget) return; mxWidget->GrabFocus(); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index b2c45fd6c4da..bd3eac3545ef 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -1058,7 +1058,7 @@ IMPL_LINK_NOARG(DockingWindow, ImplHandleLayoutTimerHdl, Timer*, void) setPosSizeOnContainee(); } -InterimDockingWindow::InterimDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame, bool bTearable) +DropdownDockingWindow::DropdownDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame, bool bTearable) : DockingWindow(pParent, !bTearable ? OString("InterimDockParent") : OString("InterimTearableParent"), !bTearable ? OUString("vcl/ui/interimdockparent.ui") : OUString("vcl/ui/interimtearableparent.ui"), @@ -1067,12 +1067,12 @@ InterimDockingWindow::InterimDockingWindow(vcl::Window* pParent, const css::uno: { } -InterimDockingWindow::~InterimDockingWindow() +DropdownDockingWindow::~DropdownDockingWindow() { disposeOnce(); } -void InterimDockingWindow::dispose() +void DropdownDockingWindow::dispose() { m_xBox.clear(); DockingWindow::dispose(); |