diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-29 15:07:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-29 18:13:33 +0200 |
| commit | 663ce5d0f89e9523183ed9ca4cbfcdacf9df4cc8 (patch) | |
| tree | 72e8f6aa0e5020134ae2624cb6c12ae1ab66e30a /svtools | |
| parent | 416cb76758719b88a4cdefe8c9d16131c35cfdf5 (diff) | |
tdf#136520 allow color popdowns to be tearable again
Change-Id: Ic92ef5235662e1680aadb5666e05dad1bf808e9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103625
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 04d782ec71fd..259115c90a98 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -174,8 +174,11 @@ 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) - : DockingWindow(pParent, "InterimDockParent", "svx/ui/interimdockparent.ui", rFrame) + std::unique_ptr<WeldToolbarPopup> xPopup, bool bTearable) + : DockingWindow(pParent, + !bTearable ? OString("InterimDockParent") : OString("InterimTearableParent"), + !bTearable ? OUString("svx/ui/interimdockparent.ui") : OUString("svx/ui/interimtearableparent.ui"), + rFrame) , m_xBox(get("box")) , m_xFrame(rFrame) , m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(), "svx/ui/interimparent.ui", false)) |