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 /svx/source | |
| 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 'svx/source')
| -rw-r--r-- | svx/source/mnuctrls/smarttagmenu.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx index c684fed7abb6..5d0eb6e03bde 100644 --- a/svx/source/mnuctrls/smarttagmenu.cxx +++ b/svx/source/mnuctrls/smarttagmenu.cxx @@ -180,7 +180,7 @@ void SmartTagMenuController::FillMenu() { const OUString aCommand = ".uno:AutoCorrectDlg?OpenSmartTag:bool=true"; pVCLMenu->InsertSeparator(); - pVCLMenu->InsertItem( nMenuId, vcl::CommandInfoProvider::Instance().GetPopupLabelForCommand( aCommand, m_xFrame ) ); + pVCLMenu->InsertItem( nMenuId, vcl::CommandInfoProvider::GetPopupLabelForCommand( aCommand, m_xFrame ) ); pVCLMenu->SetItemCommand( nMenuId, aCommand ); } } diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index 8f30ac1ff5af..a56e004fa670 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -132,7 +132,7 @@ void DefaultShapesPanel::populateShapes() { sSlotStr = aSet.second[i]; aSlotImage = ::GetImage(mxFrame, sSlotStr, false); - sLabel = vcl::CommandInfoProvider::Instance().GetTooltipForCommand(sSlotStr, mxFrame); + sLabel = vcl::CommandInfoProvider::GetTooltipForCommand(sSlotStr, mxFrame); aSet.first->InsertItem(i, aSlotImage, sLabel); } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 78540607b35c..c1f2a3a0d1f4 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1312,7 +1312,7 @@ SvxColorWindow::SvxColorWindow(const OUString& rCommand, } } - OUString aWindowTitle = vcl::CommandInfoProvider::Instance().GetLabelForCommand( rCommand, rFrame ); + OUString aWindowTitle = vcl::CommandInfoProvider::GetLabelForCommand( rCommand, rFrame ); SetText( aWindowTitle ); mpColorSet->SetAccessibleName( aWindowTitle ); |