diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-19 20:54:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-20 11:28:21 +0100 |
| commit | 41fe604a2e48c8c921a29bf4240abf8929582e2e (patch) | |
| tree | 83ea7489f9bdd77f61ab3b4c464c51ef56918979 /svtools/source/control/toolbarmenu.cxx | |
| parent | 1e0ade8b56c644868a72156186ab5c83e2abfb69 (diff) | |
merge together interimdockparent usage
and their uses of VclBuilder can be contained to vcl
Change-Id: I0cbbd3175e4ec857187b7f1716232a3514fe9605
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111251
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools/source/control/toolbarmenu.cxx')
| -rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 802321bb12c6..d7336caddb67 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -21,7 +21,6 @@ #include <comphelper/processfactory.hxx> #include <osl/diagnose.h> -#include <vcl/builder.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/svapp.hxx> @@ -172,11 +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) - : DockingWindow(pParent, - !bTearable ? OString("InterimDockParent") : OString("InterimTearableParent"), - !bTearable ? OUString("vcl/ui/interimdockparent.ui") : OUString("vcl/ui/interimtearableparent.ui"), - rFrame) - , m_xBox(m_pUIBuilder->get("box")) + : InterimDockingWindow(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")) @@ -192,7 +187,7 @@ InterimToolbarPopup::InterimToolbarPopup(const css::uno::Reference<css::frame::X void InterimToolbarPopup::GetFocus() { - DockingWindow::GetFocus(); + InterimDockingWindow::GetFocus(); if (!m_xPopup) return; m_xPopup->GrabFocus(); @@ -216,9 +211,8 @@ void InterimToolbarPopup::dispose() m_xPopup.reset(); m_xContainer.reset(); m_xBuilder.reset(); - m_xBox.clear(); m_xFrame.clear(); - DockingWindow::dispose(); + InterimDockingWindow::dispose(); } InterimToolbarPopup::~InterimToolbarPopup() |