diff options
| author | Andre Fischer <af@apache.org> | 2013-06-03 12:33:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-04 11:40:14 +0100 |
| commit | a1929fb6282e33770bced4c6a1cd9e0760947f9f (patch) | |
| tree | 58b2f1856fb7e2ddcdc76f0a86b89d3351f5894e /sfx2 | |
| parent | ebacea41751ed59b53a76aec70dddfd2d88aae84 (diff) | |
Resolves: #i122433# The sidebar ControllerItem can now...
give access to the extended help text for commands
(cherry picked from commit 3f483a9219b9135f9f854d62b4ad0512d3752660)
Conflicts:
sfx2/inc/sfx2/sidebar/ControllerItem.hxx
Change-Id: I22668e6f9c1c7aed174a43d7d3e04829dc6733ae
Related: #i122433# fix build breaker
invalid use of incomplete type 'struct Help'
(cherry picked from commit 797e399967ffb1c28b8c32d328f5f57d79a8caf3)
Change-Id: Ifde6fede9b91eb828c665a5a720b93171108e17b
(cherry picked from commit 3b55196fb07c9101f0f0f51895a8083cbf5e78fc)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/ControllerItem.cxx | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index 5abc109cc425..eb22a184054f 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -25,6 +25,7 @@ #include "sfx2/sidebar/CommandInfoProvider.hxx" #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <vcl/help.hxx> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> @@ -202,6 +203,23 @@ void ControllerItem::ResetFrame (void) +::rtl::OUString ControllerItem::GetHelpText (void) const +{ + Help* pHelp = Application::GetHelp(); + if (pHelp != NULL) + { + if (msCommandName.getLength() > 0) + { + const ::rtl::OUString sHelp (pHelp->GetHelpText(A2S(".uno:")+msCommandName, NULL)); + return sHelp; + } + } + return ::rtl::OUString(); +} + + + + Image ControllerItem::GetIcon (void) const { return GetImage(mxFrame, A2S(".uno:")+msCommandName, sal_False); @@ -218,6 +236,7 @@ ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface() void ControllerItem::SetupToolBoxItem (ToolBox& rToolBox, const sal_uInt16 nIndex) { rToolBox.SetQuickHelpText(nIndex, GetLabel()); + rToolBox.SetHelpText(nIndex, GetHelpText()); rToolBox.SetItemImage(nIndex, GetIcon()); } |