diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-13 17:00:03 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-16 08:08:09 +0100 |
| commit | 099f1016fa507809e24f0874848f6107a08a4fb0 (patch) | |
| tree | 09e6d1bf78cc27e4ac9e0deced6b9b69c9f6f800 /sfx2/source/sidebar/ControllerFactory.cxx | |
| parent | 773a07a94ebc9f578b5bb6a90ddd1974d1577351 (diff) | |
Cleanup: Consolidate the different ways to get command labels/tooltips
Change-Id: Ieab809a3122c9d592894b84ec2e68195a4e02dde
Diffstat (limited to 'sfx2/source/sidebar/ControllerFactory.cxx')
| -rw-r--r-- | sfx2/source/sidebar/ControllerFactory.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index 17980cdff0c9..65590377019a 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -18,7 +18,6 @@ */ #include <sfx2/sidebar/ControllerFactory.hxx> -#include <sfx2/sidebar/CommandInfoProvider.hxx> #include <sfx2/sidebar/Tools.hxx> #include <com/sun/star/frame/XToolbarController.hpp> @@ -28,6 +27,7 @@ #include <framework/sfxhelperfunctions.hxx> #include <svtools/generictoolboxcontroller.hxx> +#include <svtools/commandinfoprovider.hxx> #include <comphelper/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -120,13 +120,13 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( if (xUpdatable.is()) xUpdatable->update(); - // Add label. + // Add tooltip. if (xController.is()) { - const OUString sLabel (sfx2::sidebar::CommandInfoProvider::Instance().GetLabelForCommand( + const OUString sTooltip (svt::CommandInfoProvider::Instance().GetTooltipForCommand( rsCommandName, rxFrame)); - pToolBox->SetQuickHelpText(nItemId, sLabel); + pToolBox->SetQuickHelpText(nItemId, sTooltip); pToolBox->EnableItem(nItemId); } } |