diff options
| author | Rohan Kumar <rohankanojia420@gmail.com> | 2017-01-24 21:18:00 +0530 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-21 01:39:01 +0200 |
| commit | 33c51e8002f58847ba43bc111dabc49278e36daf (patch) | |
| tree | a1e276b24a26d4fe594b08dd47dfdaeda31cd020 /sd | |
| parent | e25bf8505cfaa3599c2e78a7c56729280f27373e (diff) | |
tdf#95844 Refactor CommandInfoProvider
Instead of a singleton, CommandInfoProvider should just be a set of static methods.
Change-Id: I16d4406e361a72f013d78f18d6bd0ae20c0cc5e9
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index db34b253d426..e2f2cfa8eff4 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -241,11 +241,11 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, vcl::W sSlotStr = ".uno:DuplicatePage"; else sSlotStr = ".uno:Undo"; - aSlotImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(sSlotStr, xFrame); + aSlotImage = vcl::CommandInfoProvider::GetImageForCommand(sSlotStr, xFrame); OUString sSlotTitle; if( bInsertPage ) - sSlotTitle = vcl::CommandInfoProvider::Instance().GetLabelForCommand( sSlotStr, xFrame ); + sSlotTitle = vcl::CommandInfoProvider::GetLabelForCommand( sSlotStr, xFrame ); else sSlotTitle = SD_RESSTR( STR_RESET_LAYOUT ); appendEntry( 2, sSlotTitle, aSlotImage); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 8a3665bda16a..378747e6474a 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -976,7 +976,7 @@ vcl::Window* ViewShellBase::GetViewWindow() OUString ViewShellBase::RetrieveLabelFromCommand( const OUString& aCmdURL ) const { Reference< XFrame > xFrame( GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(), UNO_QUERY ); - return vcl::CommandInfoProvider::Instance().GetLabelForCommand( aCmdURL, xFrame ); + return vcl::CommandInfoProvider::GetLabelForCommand( aCmdURL, xFrame ); } int ViewShellBase::getPart() const |