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>

7 files changed, 19 insertions, 19 deletions

diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index e68043b34ed5..5a47d18625f3 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -82,7 +82,7 @@ public:
     void unsetPopover();
 };
 
-class SVT_DLLPUBLIC InterimToolbarPopup final : public InterimDockingWindow
+class SVT_DLLPUBLIC InterimToolbarPopup final : public DropdownDockingWindow
 {
 private:
     css::uno::Reference<css::frame::XFrame> m_xFrame;
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 390c96267f0b..f02866f0a9e5 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -378,15 +378,15 @@ inline void DockingWindow::SetIdleDebugName( const char *pDebugName )
     maLayoutIdle.SetDebugName( pDebugName );
 }
 
-class VCL_DLLPUBLIC InterimDockingWindow : public DockingWindow
+class VCL_DLLPUBLIC DropdownDockingWindow : public DockingWindow
 {
 protected:
     VclPtr<vcl::Window> m_xBox;
 public:
-    InterimDockingWindow(vcl::Window* pParent,
+    DropdownDockingWindow(vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>(),
         bool bTearable = false);
-    virtual ~InterimDockingWindow() override;
+    virtual ~DropdownDockingWindow() override;
     virtual void dispose() override;
 };
 
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index b2da89bb7717..19c098a8d96e 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -567,7 +567,7 @@ ScCheckListMenuControl::~ScCheckListMenuControl()
 ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc, bool bCanHaveSubMenu,
                                              bool bTreeMode, int nWidth, ScCheckListMenuWindow* pParentMenu,
                                              vcl::ILibreOfficeKitNotifier* pNotifier)
-    : InterimDockingWindow(pParent)
+    : DropdownDockingWindow(pParent)
     , mxParentMenu(pParentMenu)
 {
     if (pNotifier)
@@ -586,7 +586,7 @@ bool ScCheckListMenuWindow::EventNotify(NotifyEvent& rNEvt)
         rMenuControl.queueCloseSubMenu();
         rMenuControl.clearSelectedMenuItem();
     }
-    return InterimDockingWindow::EventNotify(rNEvt);
+    return DropdownDockingWindow::EventNotify(rNEvt);
 }
 
 ScCheckListMenuWindow::~ScCheckListMenuWindow()
@@ -598,12 +598,12 @@ void ScCheckListMenuWindow::dispose()
 {
     mxControl.reset();
     mxParentMenu.clear();
-    InterimDockingWindow::dispose();
+    DropdownDockingWindow::dispose();
 }
 
 void ScCheckListMenuWindow::GetFocus()
 {
-    InterimDockingWindow::GetFocus();
+    DropdownDockingWindow::GetFocus();
     if (!mxControl)
         return;
     mxControl->GrabFocus();
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index a00e1447557c..6f1a7377fdbd 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -297,7 +297,7 @@ private:
  * This class implements a popup window for field button, for quick access
  * of hide-item list, and possibly more stuff related to field options.
  */
-class ScCheckListMenuWindow : public InterimDockingWindow
+class ScCheckListMenuWindow : public DropdownDockingWindow
 {
 public:
     explicit ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc,
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index d7336caddb67..4149afa4b7a7 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -171,7 +171,7 @@ IMPL_LINK_NOARG(ToolbarPopupContainer, FocusHdl, weld::Widget&, void)
 
 InterimToolbarPopup::InterimToolbarPopup(const css::uno::Reference<css::frame::XFrame>& rFrame, vcl::Window* pParent,
                                          std::unique_ptr<WeldToolbarPopup> xPopup, bool bTearable)
-    : InterimDockingWindow(pParent, rFrame, bTearable)
+    : DropdownDockingWindow(pParent, rFrame, bTearable)
     , m_xFrame(rFrame)
     , m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(), "svt/ui/interimparent.ui", false))
     , m_xContainer(m_xBuilder->weld_container("container"))
@@ -187,7 +187,7 @@ InterimToolbarPopup::InterimToolbarPopup(const css::uno::Reference<css::frame::X
 
 void InterimToolbarPopup::GetFocus()
 {
-    InterimDockingWindow::GetFocus();
+    DropdownDockingWindow::GetFocus();
     if (!m_xPopup)
         return;
     m_xPopup->GrabFocus();
@@ -212,7 +212,7 @@ void InterimToolbarPopup::dispose()
     m_xContainer.reset();
     m_xBuilder.reset();
     m_xFrame.clear();
-    InterimDockingWindow::dispose();
+    DropdownDockingWindow::dispose();
 }
 
 InterimToolbarPopup::~InterimToolbarPopup()
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();