diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-02 14:45:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-06 16:44:21 +0100 |
| commit | 40fe5b93bc0838e04b46bfc7942d1ee6a2482ce0 (patch) | |
| tree | 151814d0863c9912d18722732beb13b1e22e0ff1 /sfx2 | |
| parent | d1133d71a6109d1999121fd6a91573d12dc4852b (diff) | |
weld AreaPropertyPanel
Change-Id: I5f4c4b43067b99cd57f8ea941002481ef5977e09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86144
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/ControllerFactory.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/toolbox/weldutils.cxx | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index 61ed92452c54..49b67cbf6e07 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -231,6 +231,10 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBarController( aPropValue.Value <<= rxToolbar; aPropertyVector.push_back( makeAny( aPropValue )); + aPropValue.Name = "IsSidebar"; + aPropValue.Value <<= true; + aPropertyVector.push_back( makeAny( aPropValue )); + if (nWidth > 0) { aPropValue.Name = "Width"; diff --git a/sfx2/source/toolbox/weldutils.cxx b/sfx2/source/toolbox/weldutils.cxx index 3f2d0970cc6e..52cf254d7b9a 100644 --- a/sfx2/source/toolbox/weldutils.cxx +++ b/sfx2/source/toolbox/weldutils.cxx @@ -57,6 +57,8 @@ ToolbarUnoDispatcher::ToolbarUnoDispatcher(weld::Toolbar& rToolbar, : m_xFrame(rFrame) , m_pToolbar(&rToolbar) { + rToolbar.connect_clicked(LINK(this, ToolbarUnoDispatcher, SelectHdl)); + OUString aModuleName(vcl::CommandInfoProvider::GetModuleIdentifier(rFrame)); vcl::ImageType eSize = rToolbar.get_icon_size(); @@ -75,12 +77,10 @@ ToolbarUnoDispatcher::ToolbarUnoDispatcher(weld::Toolbar& rToolbar, vcl::CommandInfoProvider::GetTooltipForCommand(sCommand, aProperties, rFrame)); rToolbar.set_item_tooltip_text(i, aTooltip); auto xImage(vcl::CommandInfoProvider::GetXGraphicForCommand(sCommand, rFrame, eSize)); - rToolbar.set_item_icon(i, xImage); + rToolbar.set_item_image(i, xImage); CreateController(sCommand); } - - rToolbar.connect_clicked(LINK(this, ToolbarUnoDispatcher, SelectHdl)); } void ToolbarUnoDispatcher::CreateController(const OUString& rCommand) |