diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-03-10 16:20:07 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-04-22 16:12:28 +0200 |
| commit | 2845df5b6a3fc598fa59f972b6ce281b36177736 (patch) | |
| tree | 24eea8ce9c39aab5c7cb3199ea2ee6940b3d010a /svtools | |
| parent | a3f56525b391ed73f751a7dc86aae494df3d1f65 (diff) | |
Extend ToolBarManager to build weld::Toolbar
- used for SubToolBarController eg. framework shape toolbar popup
present in the sidebar fontwork panel
- add separate implementation for vcl and weld based ToolBarManager
- provide basic functionality for weld based (just inserting standard items with icons
and controllers)
- not implemented: addons items merging etc.
Change-Id: I8e460f34abd512d70e95a1d484d728b7d809ce9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113387
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114411
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index b376490fa4fd..a8f18d60c61c 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -119,7 +119,7 @@ WeldToolbarPopup::WeldToolbarPopup(const css::uno::Reference<css::frame::XFrame> weld::Widget* pParent, const OUString& rUIFile, const OString& rId) : m_xBuilder(Application::CreateBuilder(pParent, rUIFile)) - , m_xTopLevel(m_xBuilder->weld_container(rId)) + , m_xTopLevel(m_xBuilder->weld_popover(rId)) , m_xContainer(m_xBuilder->weld_container("container")) , m_xFrame(rFrame) { |