diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-25 11:21:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-26 16:46:55 +0100 |
| commit | b509d72a79a8c64d03ea8f91c69c58a24e0b2dc7 (patch) | |
| tree | 97770ab005aac451b4c34a1fae562a3d579adb1f /sd | |
| parent | ea31d3cc8566eeb9d3dbf55b385d8c619daaddf9 (diff) | |
tdf#126043 fetch the command properties just once
Change-Id: Iaf343e9858be36ca8772d9c12eee772d93b4c394
Reviewed-on: https://gerrit.libreoffice.org/83668
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/83763
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index fc64f7439d78..f4c5804d4522 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -226,7 +226,10 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, vcl::W OUString sSlotTitle; if( bInsertPage ) - sSlotTitle = vcl::CommandInfoProvider::GetLabelForCommand( sSlotStr, rController.getModuleName() ); + { + auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(sSlotStr, rController.getModuleName()); + sSlotTitle = vcl::CommandInfoProvider::GetLabelForCommand(aProperties); + } else sSlotTitle = SdResId( STR_RESET_LAYOUT ); appendEntry( 2, sSlotTitle, aSlotImage); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 89ee4c17138e..5f872e7b8a7b 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -963,7 +963,8 @@ vcl::Window* ViewShellBase::GetViewWindow() OUString ViewShellBase::RetrieveLabelFromCommand( const OUString& aCmdURL ) const { OUString aModuleName(vcl::CommandInfoProvider::GetModuleIdentifier(GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface())); - return vcl::CommandInfoProvider::GetLabelForCommand( aCmdURL, aModuleName ); + auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(aCmdURL, aModuleName); + return vcl::CommandInfoProvider::GetLabelForCommand(aProperties); } int ViewShellBase::getPart() const |